diff --git a/gluon/gluon-config-mode/Makefile b/gluon/gluon-config-mode/Makefile
index 1ce36ae..8a1ad5b 100644
--- a/gluon/gluon-config-mode/Makefile
+++ b/gluon/gluon-config-mode/Makefile
@@ -15,7 +15,7 @@ define Package/gluon-config-mode
   SECTION:=gluon
   CATEGORY:=Gluon
   TITLE:=Luci based config mode for user friendly setup of new meshnodes
-  DEPENDS:=+gluon-core +gluon-location +gluon-simple-tc +uhttpd +dnsmasq +luci-mod-admin-core +ip +luci-theme-openwrt +haveged
+  DEPENDS:=+gluon-core +gluon-lock-password +gluon-location +gluon-simple-tc +uhttpd +dnsmasq +luci-mod-admin-core +ip +luci-theme-openwrt +haveged
 endef
 
 define Package/gluon-config-mode/description
diff --git a/gluon/gluon-lock-password/Makefile b/gluon/gluon-lock-password/Makefile
new file mode 100644
index 0000000..d0e9937
--- /dev/null
+++ b/gluon/gluon-lock-password/Makefile
@@ -0,0 +1,36 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gluon-lock-password
+PKG_VERSION:=1
+PKG_RELEASE:=1
+
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/gluon-lock-password
+  SECTION:=gluon
+  CATEGORY:=Gluon
+  TITLE:=Locks the root account by default
+  DEPENDS:=+gluon-core
+endef
+
+define Package/gluon-lock-password/description
+	This packages locks the root account by default.
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+endef
+
+define Package/gluon-lock-password/install
+	$(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,gluon-lock-password))
diff --git a/gluon/gluon-lock-password/files/lib/gluon/upgrade/lock-password/initial/010-lock-password b/gluon/gluon-lock-password/files/lib/gluon/upgrade/lock-password/initial/010-lock-password
new file mode 100755
index 0000000..6e67fc4
--- /dev/null
+++ b/gluon/gluon-lock-password/files/lib/gluon/upgrade/lock-password/initial/010-lock-password
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+passwd -l root