diff --git a/src/Socialbox/Classes/StandardMethods/SettingsSetPassword.php b/src/Socialbox/Classes/StandardMethods/SettingsSetPassword.php
index 1c180dd..73eca67 100644
--- a/src/Socialbox/Classes/StandardMethods/SettingsSetPassword.php
+++ b/src/Socialbox/Classes/StandardMethods/SettingsSetPassword.php
@@ -50,10 +50,7 @@
                 PasswordManager::setPassword($request->getPeer(), $rpcRequest->getParameter('password'));
 
                 // Remove the SET_PASSWORD flag & update the session flow if necessary
-                if($request->getSession()->flagExists(SessionFlags::SET_PASSWORD))
-                {
-                    SessionManager::updateFlow($request->getSession(), [SessionFlags::SET_PASSWORD]);
-                }
+                SessionManager::updateFlow($request->getSession(), [SessionFlags::SET_PASSWORD]);
             }
             catch(Exception $e)
             {