diff --git a/db/migrate/20130625170842_remove_access_password.rb b/db/migrate/20130625170842_remove_access_password.rb
index c1fd54084fc..dba45885c74 100644
--- a/db/migrate/20130625170842_remove_access_password.rb
+++ b/db/migrate/20130625170842_remove_access_password.rb
@@ -1,6 +1,6 @@
 class RemoveAccessPassword < ActiveRecord::Migration
   def up
-    result = execute("SELECT count(*) FROM site_settings where name='access_password'")
+    result = execute("SELECT count(*) FROM site_settings where name='access_password' and char_length(value) > 0")
     if result[0] and result[0]["count"].to_i > 0
       execute "DELETE FROM site_settings where name='access_password'"
       SiteSetting.login_required = true