diff --git a/app/controllers/profile.php b/app/controllers/profile.php
index e6b9dbe..9a8fb4e 100644
--- a/app/controllers/profile.php
+++ b/app/controllers/profile.php
@@ -32,6 +32,7 @@ Router\post_action('profile', function () {
         $new_password = empty($values['password']) ? null : $values['password'];
         if (Model\User\update_user($user_id, $values['username'], $new_password)) {
             SessionStorage::getInstance()->setFlashMessage(t('Your preferences are updated.'));
+            SessionStorage::getInstance()->setUser(Model\User\get_user_by_id($user_id));
         } else {
             SessionStorage::getInstance()->setFlashErrorMessage(t('Unable to update your preferences.'));
         }
diff --git a/app/core/session.php b/app/core/session.php
index 00d05d1..c36039b 100644
--- a/app/core/session.php
+++ b/app/core/session.php
@@ -45,6 +45,19 @@ class SessionManager
 
     public static function close()
     {
+        $params = session_get_cookie_params();
+
+        setcookie(
+            session_name(),
+            '',
+            time() - 42000,
+            $params['path'],
+            $params['domain'],
+            $params['secure'],
+            $params['httponly']
+        );
+
+        session_unset();
         session_destroy();
     }
 }