diff --git a/app/assets/javascripts/discourse/templates/modal/edit-category.js.handlebars b/app/assets/javascripts/discourse/templates/modal/edit-category.js.handlebars
index 6f1b67241b5..786de606f49 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit-category.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/modal/edit-category.js.handlebars
@@ -3,9 +3,9 @@
     {{edit-category-tab selectedTab=selectedTab tab="general"}}
     {{#unless isUncategorizedCategory}}
       {{edit-category-tab selectedTab=selectedTab tab="security"}}
-      {{edit-category-tab selectedTab=selectedTab tab="settings"}}
-      {{edit-category-tab selectedTab=selectedTab tab="images"}}
     {{/unless}}
+    {{edit-category-tab selectedTab=selectedTab tab="settings"}}
+    {{edit-category-tab selectedTab=selectedTab tab="images"}}
   </ul>
 
   <div class="modal-body">
diff --git a/db/migrate/20140711193923_remove_email_in_address_setting.rb b/db/migrate/20140711193923_remove_email_in_address_setting.rb
index cc2f6b63119..f81efdb7a60 100644
--- a/db/migrate/20140711193923_remove_email_in_address_setting.rb
+++ b/db/migrate/20140711193923_remove_email_in_address_setting.rb
@@ -1,9 +1,11 @@
 class RemoveEmailInAddressSetting < ActiveRecord::Migration
   def up
+    uncat_id = ActiveRecord::Base.exec_sql("SELECT value FROM site_settings WHERE name = 'uncategorized_category_id'").first
     cat_id_r = ActiveRecord::Base.exec_sql("SELECT value FROM site_settings WHERE name = 'email_in_category'").first
     email_r = ActiveRecord::Base.exec_sql("SELECT value FROM site_settings WHERE name = 'email_in_address'").first
-    if cat_id_r && email_r
-      category_id = cat_id_r["value"].to_i
+    if email_r
+      category_id = uncat_id["value"].to_i
+      category_id = cat_id_r["value"].to_i if cat_id_r
       email = email_r["value"]
       ActiveRecord::Base.exec_sql("UPDATE categories SET email_in = ? WHERE id = ?", email, category_id)
     end