diff --git a/app/assets/javascripts/discourse/controllers/composer_controller.js b/app/assets/javascripts/discourse/controllers/composer_controller.js
index b0940bea272..6b62f5bb670 100644
--- a/app/assets/javascripts/discourse/controllers/composer_controller.js
+++ b/app/assets/javascripts/discourse/controllers/composer_controller.js
@@ -42,6 +42,7 @@ Discourse.ComposerController = Discourse.Controller.extend({
 
     if( composer.get('cantSubmitPost') ) {
       this.set('view.showTitleTip', true);
+      this.set('view.showCategoryTip', true);
       this.set('view.showReplyTip', true);
       return;
     }
@@ -336,6 +337,7 @@ Discourse.ComposerController = Discourse.Controller.extend({
     this.set('content', null);
     this.set('view.content', null);
     this.set('view.showTitleTip', false);
+    this.set('view.showCategoryTip', false);
     this.set('view.showReplyTip', false);
   },
 
diff --git a/app/assets/javascripts/discourse/models/composer.js b/app/assets/javascripts/discourse/models/composer.js
index 68ceff6f64b..860c31ef2de 100644
--- a/app/assets/javascripts/discourse/models/composer.js
+++ b/app/assets/javascripts/discourse/models/composer.js
@@ -172,8 +172,10 @@ Discourse.Composer = Discourse.Model.extend({
     // reply is always required
     if (this.get('replyLength') < Discourse.SiteSettings.min_post_length) return true;
 
+    if (!Discourse.SiteSettings.allow_uncategorized_topics && !this.get('categoryName')) return true;
+
     return false;
-  }.property('loading', 'editTitle', 'titleLength', 'targetUsernames', 'replyLength'),
+  }.property('loading', 'editTitle', 'titleLength', 'targetUsernames', 'replyLength', 'categoryName'),
 
   // The text for the save button
   saveText: function() {
diff --git a/app/assets/javascripts/discourse/templates/composer.js.handlebars b/app/assets/javascripts/discourse/templates/composer.js.handlebars
index aab1e64fed9..d96650b23d8 100644
--- a/app/assets/javascripts/discourse/templates/composer.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/composer.js.handlebars
@@ -39,7 +39,10 @@
             </div>
 
             {{#unless content.creatingPrivateMessage}}
-              {{view Discourse.ComboboxViewCategory valueAttribute="name" contentBinding="categories" valueBinding="content.categoryName"}}
+              <div class="category-input">
+                {{view Discourse.ComboboxViewCategory valueAttribute="name" contentBinding="categories" valueBinding="content.categoryName" showUncategorized="true"}}
+                {{popupInputTip validation=view.categoryValidation show=view.showCategoryTip}}
+              </div>
               {{#if content.archetype.hasOptions}}
                 <button class='btn' {{action showOptions}}>{{i18n topic.options}}</button>
               {{/if}}
diff --git a/app/assets/javascripts/discourse/views/combobox_view_category.js b/app/assets/javascripts/discourse/views/combobox_view_category.js
index eea7101a886..d2ddfdeb08f 100644
--- a/app/assets/javascripts/discourse/views/combobox_view_category.js
+++ b/app/assets/javascripts/discourse/views/combobox_view_category.js
@@ -7,12 +7,15 @@
   @module Discourse
 **/
 Discourse.ComboboxViewCategory = Discourse.ComboboxView.extend({
-  none: 'category.none',
   classNames: ['combobox category-combobox'],
   overrideWidths: true,
   dataAttributes: ['name', 'color', 'text_color', 'description', 'topic_count'],
   valueBinding: Ember.Binding.oneWay('source'),
 
+  none: function() {
+    if (Discourse.SiteSettings.allow_uncategorized_topics || this.get('showUncategorized')) return 'category.none';
+  }.property('showUncategorized'),
+
   template: function(text, templateData) {
     if (!templateData.color) return text;
     var result = "<span class='badge-category' style='background-color: #" + templateData.color + '; color: #' +
diff --git a/app/assets/javascripts/discourse/views/composer_view.js b/app/assets/javascripts/discourse/views/composer_view.js
index 2d8b7d0b5db..a76ca09f933 100644
--- a/app/assets/javascripts/discourse/views/composer_view.js
+++ b/app/assets/javascripts/discourse/views/composer_view.js
@@ -384,6 +384,12 @@ Discourse.ComposerView = Discourse.View.extend({
     }
   }.property('content.title'),
 
+  categoryValidation: function() {
+    if( !Discourse.SiteSettings.allow_uncategorized_topics && !this.get('content.categoryName')) {
+      return Discourse.InputValidation.create({ failed: true, reason: Em.String.i18n('composer.error.category_missing') });
+    }
+  }.property('content.categoryName'),
+
   replyValidation: function() {
     var reply = this.get('content.reply'), reason;
     if( !reply || reply.length < 1 ){
diff --git a/app/assets/stylesheets/application/compose.css.scss b/app/assets/stylesheets/application/compose.css.scss
index a1477934b0b..ffe634169c9 100644
--- a/app/assets/stylesheets/application/compose.css.scss
+++ b/app/assets/stylesheets/application/compose.css.scss
@@ -322,14 +322,19 @@
       bottom: 8px;
     }
   }
-  .title-input {
+  .title-input, .category-input {
     position: relative;
     display: inline;
-    .popup-tip {
-      width: 300px;
-      left: -8px;
-      margin-top: 8px;
-    }
+  }
+  .title-input .popup-tip {
+    width: 300px;
+    left: -8px;
+    margin-top: 8px;
+  }
+  .category-input .popup-tip {
+    width: 240px;
+    left: 432px;
+    top: -7px;
   }
 }
 
diff --git a/app/models/site_setting.rb b/app/models/site_setting.rb
index 903ef7ea7ee..fe202f48d96 100644
--- a/app/models/site_setting.rb
+++ b/app/models/site_setting.rb
@@ -35,6 +35,7 @@ class SiteSetting < ActiveRecord::Base
   client_setting(:max_post_length, 16000)
   client_setting(:min_topic_title_length, 15)
   client_setting(:max_topic_title_length, 255)
+  client_setting(:allow_uncategorized_topics, true)
   client_setting(:min_search_term_length, 3)
   client_setting(:flush_timings_secs, 5)
   client_setting(:supress_reply_directly_below, true)
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index b116b51a42f..7f242843f0b 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -343,6 +343,7 @@ en:
         title_length: "Title needs between {{min}} and {{max}} characters."
         post_missing: "Post can't be empty."
         post_length: "Post must be at least {{min}} characters long."
+        category_missing: "You must choose a category."
 
       save_edit: "Save Edit"
       reply_original: "Reply on Original Topic"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 7c34f9e4e79..1e9f15f11fc 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -417,6 +417,7 @@ en:
     min_topic_title_length: "Minimum topic title length in characters"
     max_topic_title_length: "Maximum topic title length in characters"
     min_search_term_length: "Minimum search term length in characters"
+    allow_uncategorized_topics: "Allow topics to be created without a category"
     allow_duplicate_topic_titles: "Allow topics with identical titles"
     unique_posts_mins: "How many minutes before a user can make a post with the same content again"
     enforce_global_nicknames: "Enforce global nickname uniqueness (WARNING: only change this during initial setup)"