diff --git a/images/macos/provision/bootstrap-provisioner/kcpassword.py b/images/macos/provision/bootstrap-provisioner/kcpassword.py
index 6de2f02a..6ab3a51b 100755
--- a/images/macos/provision/bootstrap-provisioner/kcpassword.py
+++ b/images/macos/provision/bootstrap-provisioner/kcpassword.py
@@ -18,7 +18,9 @@ def kcpassword(passwd):
     passwd = [ord(x) for x in list(passwd)]
     # pad passwd length out to an even multiple of key length
     r = len(passwd) % key_len
-    if (r > 0):
+    if len(passwd) == 11:
+        passwd += [0]
+    elif (r > 0):
         passwd = passwd + [0] * (key_len - r)
 
     for n in range(0, len(passwd), len(key)):
diff --git a/images/macos/provision/bootstrap-provisioner/setAutoLogin.sh b/images/macos/provision/bootstrap-provisioner/setAutoLogin.sh
index bafb263c..d8e1b186 100644
--- a/images/macos/provision/bootstrap-provisioner/setAutoLogin.sh
+++ b/images/macos/provision/bootstrap-provisioner/setAutoLogin.sh
@@ -25,7 +25,9 @@ function kcpasswordEncode {
     #get padding by subtraction if under 11
     local r=$(( ${#thisStringHex_array[@]} % 11 ))
     local padding=0
-    if [ $r -gt 0 ]; then
+    if [ ${#thisStringHex_array[@]} -eq 11 ];
+        local padding=1
+    elif [ $r -gt 0 ]; then
         local padding=$(( 11 - $r ))
     fi