diff --git a/board/common/overlay/etc/init.d/S21passwd b/board/common/overlay/etc/init.d/S21passwd
index 45fdde678b..03a1d7d6b6 100755
--- a/board/common/overlay/etc/init.d/S21passwd
+++ b/board/common/overlay/etc/init.d/S21passwd
@@ -15,7 +15,10 @@ case "$1" in
         fi
 
         # set root and admin passwords
-        password=$(/etc/init.d/adminpw)
+        password=""
+        if [ -x /etc/init.d/adminpw ]; then
+            password=$(/etc/init.d/adminpw)
+        fi
         msg_begin "Setting root password"
 
         rm -f /data/etc/shadow+
diff --git a/board/common/overlay/etc/init.d/adminpw b/board/common/overlay/etc/init.d/adminpw
index 8e45d40e1c..2dbbc137ca 100755
--- a/board/common/overlay/etc/init.d/adminpw
+++ b/board/common/overlay/etc/init.d/adminpw
@@ -1,6 +1,4 @@
 #!/bin/bash
 
-if [ -f /data/etc/motion.conf ]; then
-    cat /data/etc/motion.conf | grep admin_password | grep -v _hash | cut -d ' ' -f 3-
-fi
+# echo your admin password here