diff --git a/gluon/globals.py b/gluon/globals.py
index 3fbe42ba..644a6b83 100644
--- a/gluon/globals.py
+++ b/gluon/globals.py
@@ -1023,16 +1023,10 @@ class Session(Storage):
     def _fixup_before_save(self):
         response = current.response
         rcookies = response.cookies
-        scookies = rcookies.get(response.session_id_name)
-        if not scookies:
-            return
-        if self._forget:
+        if self._forget and response.session_id_name in rcookies:
             del rcookies[response.session_id_name]
-            return
-        if self.get('httponly_cookies',True):
-            scookies['HttpOnly'] = True
-        if self._secure:
-            scookies['secure'] = True
+        elif self._secure and response.session_id_name in rcookies:
+            rcookies[response.session_id_name]['secure'] = True
 
     def clear_session_cookies(self):
         request = current.request