diff --git a/buildconf/local.conf.sample b/buildconf/local.conf.sample
index 0340fdd..76fdaec 100644
--- a/buildconf/local.conf.sample
+++ b/buildconf/local.conf.sample
@@ -9,7 +9,7 @@ PACKAGE_CLASSES ?= "package_ipk"
 
 #SDKMACHINE ?= "i686"
 
-EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
+#EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
 
 USER_CLASSES ?= "buildstats image-mklibs image-prelink"
 
diff --git a/images/console-image.bb b/images/console-image.bb
index d40cdca..0cc4c1b 100644
--- a/images/console-image.bb
+++ b/images/console-image.bb
@@ -2,9 +2,15 @@ SUMMARY = "A console image with some additional tools"
 HOMEPAGE = "https://blackfinn.de"
 LICENSE = "MIT"
 
+inherit core-image extrausers
+
 IMAGE_FEATURES += "package-management"
 
-inherit core-image
+# Encrypt the password with: echo "<password>" | openssl passwd -1 -stdin
+EXTRA_USERS_PARAMS = " \
+	usermod -p '\$1\$4h5Qdc3i\$Vke4J2Ci5z.D3TtFDmV9r/' root; \
+    useradd -p '\$1\$4h5Qdc3i\$Vke4J2Ci5z.D3TtFDmV9r/' tkl; \
+"
 
 CORE_OS = " \
     openssh \