diff --git a/EduNetworkBuilder/PersonProfileForm.cs b/EduNetworkBuilder/PersonProfileForm.cs
index e42aa7f..b9df3db 100644
--- a/EduNetworkBuilder/PersonProfileForm.cs
+++ b/EduNetworkBuilder/PersonProfileForm.cs
@@ -113,6 +113,8 @@ namespace EduNetworkBuilder
                 CurrentUser.UserSettings.AutoStartPuzzles = false;
                 CurrentUser.UserSettings.ChosenLanguage = oldsettings.ChosenLanguage;
                 CurrentUser.UserSettings.LanguageHasBeenChosen = true;
+                CurrentUser.ChangePassAtFirstLogin = true;
+                CurrentUser.ChangePassword(true); //If they do not set a password now, they will do it next time
 
             }
             else if (CurrentUser == null)