diff --git a/EduNetworkBuilder/NetworkBuilder.cs b/EduNetworkBuilder/NetworkBuilder.cs
index 0bcd6ee..7dec458 100644
--- a/EduNetworkBuilder/NetworkBuilder.cs
+++ b/EduNetworkBuilder/NetworkBuilder.cs
@@ -1763,6 +1763,8 @@ namespace EduNetworkBuilder
                     CurrentUser = tUser;
                     CurrentUser.filepath = Path.GetDirectoryName(filename); //store the directory
                     OurSettings = NB.GetSettings(); //Grab the new settings from the user
+                    if (CurrentUser.ChangePassAtFirstLogin)
+                        CurrentUser.ChangePassword(); //change the password
                     UpdateMenu();
 
                     //Now, open a new window to edit them.
diff --git a/EduNetworkBuilder/PersonClass.cs b/EduNetworkBuilder/PersonClass.cs
index eb8abbb..c2108f4 100644
--- a/EduNetworkBuilder/PersonClass.cs
+++ b/EduNetworkBuilder/PersonClass.cs
@@ -133,6 +133,8 @@ namespace EduNetworkBuilder
                     continue;
                 }
                 ChangePassword(Password1);
+
+                if (ChangePassAtFirstLogin) ChangePassAtFirstLogin = false;//It was done.  No need to do it again.
                 done = true;
             }
         }