diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index f3ef5ded..0aaa9486 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -44,9 +44,6 @@ class AdminController < ApplicationController
       end
     else
       # no form submitted -> render template
-      if @wiki.system[:password].nil?
-        redirect_to :controller => 'wiki', :action => 'index'
-      end
     end
   end
 
diff --git a/test/functional/admin_controller_test.rb b/test/functional/admin_controller_test.rb
index b40f2b98..185bc301 100644
--- a/test/functional/admin_controller_test.rb
+++ b/test/functional/admin_controller_test.rb
@@ -98,12 +98,6 @@ class AdminControllerTest < Test::Unit::TestCase
     assert_success
   end
 
-  def test_create_web_no_form_submitted_and_no_password_set
-    @wiki.system[:password] = nil
-    process 'create_web'
-    assert_redirected_to :action => 'index'
-  end
-
 
   def test_edit_web_no_form
     process 'edit_web', 'web' => 'wiki1'