diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 08973a1d..39f64023 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -76,7 +76,7 @@ class ApplicationController < ActionController::Base
 
   def password_check(password)
     if password == @web.password
-      cookies['web_address'] = password
+      cookies[CGI.escape(@web_name)] = password
       true
     else
       false
@@ -188,7 +188,7 @@ class ApplicationController < ActionController::Base
   def authorized?
     @web.nil? or
     @web.password.nil? or
-    cookies['web_address'] == @web.password or
+    cookies[CGI.escape(@web_name)] == @web.password or
     password_check(@params['password'])
   end