diff --git a/lib/util.php b/lib/util.php
index 6044fdd92ea98b1d3c46d39b74790ab2e234ad6d..d50fa2081432246d91eab3f7c196b5a0c81ea443 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -326,7 +326,8 @@ function common_set_cookie($key, $value, $expiration=0)
                      $value,
                      $expiration,
                      $cookiepath,
-                     $server);
+                     $server,
+                     common_config('site', 'ssl')=='always');
 }
 
 define('REMEMBERME', 'rememberme');