diff --git a/EduNetworkBuilder/NetworkBuilder.cs b/EduNetworkBuilder/NetworkBuilder.cs
index 7dec458..e32819b 100644
--- a/EduNetworkBuilder/NetworkBuilder.cs
+++ b/EduNetworkBuilder/NetworkBuilder.cs
@@ -1994,6 +1994,8 @@ namespace EduNetworkBuilder
         private void classSetupToolStripMenuItem_Click(object sender, EventArgs e)
         {
             PersonProfileForm PPF = new PersonProfileForm();
+            CurrentUser.ChangePassAtFirstLogin = true;
+            CurrentUser.ChangePassword(true); //If they do not set a password now, they will do it next time
             CurrentUser = PPF.Edit();
             UpdateMenu();
         }