diff --git a/src/freedombone b/src/freedombone
index db9bf298..846d9d81 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -9364,7 +9364,7 @@ function install_search_engine {
                 SEARCH_ENGINE_PASSWORD="$(openssl rand -base64 16)"
             fi
         fi
-		echo "$SEARCH_ENGINE_PASSWORD" | htpasswd -i -d -c /etc/nginx/.htpasswd $MY_USERNAME
+        echo "$SEARCH_ENGINE_PASSWORD" | htpasswd -i -s -c /etc/nginx/.htpasswd $MY_USERNAME
         echo '' >> /home/$MY_USERNAME/README
         echo '' >> /home/$MY_USERNAME/README
         echo $'Search Engine' >> /home/$MY_USERNAME/README
diff --git a/src/freedombone-adduser b/src/freedombone-adduser
index 1f6c6b7f..d24ffb73 100755
--- a/src/freedombone-adduser
+++ b/src/freedombone-adduser
@@ -365,6 +365,12 @@ if grep -q "install_irc_client" $COMPLETION_FILE; then
     chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.irssi
 fi
 
+if [ -f /etc/nginx/.htpasswd ]; then
+	if ! grep "${MY_USERNAME}:" /etc/nginx/.htpasswd; then
+		echo "$NEW_USER_PASSWORD" | htpasswd -i -s /etc/nginx/.htpasswd $MY_USERNAME
+	fi
+fi
+
 # add user menu on ssh login
 if ! grep -q 'control' /home/$MY_USERNAME/.bashrc; then
     echo 'control' >> /home/$MY_USERNAME/.bashrc
diff --git a/src/freedombone-rmuser b/src/freedombone-rmuser
index 8e4001b0..09b14f6d 100755
--- a/src/freedombone-rmuser
+++ b/src/freedombone-rmuser
@@ -104,6 +104,12 @@ if grep -q "GNU Social domain" $COMPLETION_FILE; then
     fi
 fi
 
+if [ -f /etc/nginx/.htpasswd ]; then
+    if grep "${MY_USERNAME}:" /etc/nginx/.htpasswd; then
+        htpasswd -D /etc/nginx/.htpasswd $MY_USERNAME
+    fi
+fi
+
 #if grep -q "install_owncloud" $COMPLETION_FILE; then
 #    occ user:delete $MY_USERNAME
 #fi