diff --git a/EduNetworkBuilder/NB.cs b/EduNetworkBuilder/NB.cs
index 5f8e712..08c4d48 100644
--- a/EduNetworkBuilder/NB.cs
+++ b/EduNetworkBuilder/NB.cs
@@ -309,6 +309,8 @@ namespace EduNetworkBuilder
         public static int WirelessReconnectDistance = 70; //Try to find a closer AP if we are this far out.
         public static int UntaggedVLAN = -1; //If the packet is not tagged.
         public static int MaxPacketsBeforeOptimizing = 50;
+        public static int DefaultPasswordLen = 6;
+        public static int DefaultSaltLen = 50;
 
         public static string AllowedPasswordCharacters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-=!~@#$%^&*()_+{}[]/?<>,.";
         public static string AllowedUsernameCharacters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890._";
diff --git a/EduNetworkBuilder/TrippleDESDocumentEncryption.cs b/EduNetworkBuilder/TrippleDESDocumentEncryption.cs
index 1d34709..1fce298 100644
--- a/EduNetworkBuilder/TrippleDESDocumentEncryption.cs
+++ b/EduNetworkBuilder/TrippleDESDocumentEncryption.cs
@@ -137,12 +137,21 @@ namespace EduNetworkBuilder
 
         public static string GenSalt(Random RanGen)
         {
-            return GenCharString(RanGen, 50);
+            return GenSalt(RanGen, NB.DefaultSaltLen);
+        }
+        public static string GenSalt(Random RanGen, int length)
+        {
+            return GenCharString(RanGen, length);
         }
 
         public static string GenUserPW(Random RanGen)
         {
-            return GenCharString(RanGen, 6);
+            return GenUserPW(RanGen, NB.DefaultPasswordLen);
+        }
+
+        public static string GenUserPW(Random RanGen, int length)
+        {
+            return GenCharString(RanGen, length);
         }
 
         public static TripleDES GenKey(string password, string salt)