diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index a4e5d6fff..fb332a963 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -103,6 +103,7 @@ class CoursesController < ApplicationController
     else
       respond_to do |format|
         format.html {
+          settings
           render :action => 'settings'
         }
         format.api  { render_validation_errors(@course) }
diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb
index 19a0669f3..a3f07e21a 100644
--- a/app/controllers/settings_controller.rb
+++ b/app/controllers/settings_controller.rb
@@ -24,6 +24,7 @@ class SettingsController < ApplicationController
   before_filter :require_admin
 
   def index
+    edit
     render :action => 'edit'
   end
 
diff --git a/app/controllers/trackers_controller.rb b/app/controllers/trackers_controller.rb
index 66a7eec03..988f03952 100644
--- a/app/controllers/trackers_controller.rb
+++ b/app/controllers/trackers_controller.rb
@@ -57,6 +57,7 @@ class TrackersController < ApplicationController
       redirect_to trackers_url
       return
     end
+    new
     render :action => 'new'
   end
 
diff --git a/app/controllers/web_footer_companies_controller.rb b/app/controllers/web_footer_companies_controller.rb
index b61a58189..4c5748e40 100644
--- a/app/controllers/web_footer_companies_controller.rb
+++ b/app/controllers/web_footer_companies_controller.rb
@@ -20,6 +20,7 @@ class WebFooterCompaniesController < ApplicationController
       redirect_to web_footer_companies_url
     else
       flash[:error] = "#{l :web_footer_company_create_fail}: #{@company.errors.full_messages[0]}"
+      new
       render :action => 'new'
     end
   end
@@ -41,6 +42,7 @@ class WebFooterCompaniesController < ApplicationController
       redirect_to web_footer_companies_url
     else
       flash[:error] = "#{l :web_footer_company_update_fail}: #{@company.errors.full_messages[0]}"
+      edit
       render :action => 'edit'
     end
   end
diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 2acbd660a..de9e53554 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -68,6 +68,7 @@ class WikiController < ApplicationController
   def show
     if @page.new_record?
       if User.current.allowed_to?(:edit_wiki_pages, @project) && editable? && !api_request?
+        edit
         render :action => 'edit'
       else
         render_404
diff --git a/app/views/settings/_display.html.erb b/app/views/settings/_display.html.erb
index c375adc1a..1ae5a351a 100644
--- a/app/views/settings/_display.html.erb
+++ b/app/views/settings/_display.html.erb
@@ -11,7 +11,7 @@
 
 <p><%= setting_select :time_format, Setting::TIME_FORMATS.collect {|f| [::I18n.l(Time.now, :locale => locale, :format => f), f]}, :blank => :label_language_based %></p>
 
-<p><%#= setting_select :user_format, @options[:user_format] %></p>
+<p><%= setting_select :user_format, @options[:user_format] %></p>
 
 <p><%= setting_check_box :gravatar_enabled %></p>