diff --git a/src/freedombone-utils-webadmin b/src/freedombone-utils-webadmin
index ad9f1f5391bcb5cfca979427b4a85713d42e0a78..717dcd5faa3ef378fd975918cb8d98ece8d10a97 100755
--- a/src/freedombone-utils-webadmin
+++ b/src/freedombone-utils-webadmin
@@ -92,6 +92,7 @@ function web_admin_create_users {
             sed -i "s|USERNAME|${USERNAME}|g" "$userfile"
             if [[ "$USERNAME" == "$ADMIN_USER" ]]; then
                 sed -i "s|USERTYPE|Admin|g" "$userfile"
+                sed -i '/remove user button/,/end of remove/d' "$userfile"
             else
                 sed -i "s|USERTYPE|User|g" "$userfile"
             fi
diff --git a/webadmin/userprofile.html b/webadmin/userprofile.html
index ae012a70a400e05c0eeb692bcc2e3f1237c31e62..c1b7a9bf68e51face8790590170c4d42f7ad50db 100644
--- a/webadmin/userprofile.html
+++ b/webadmin/userprofile.html
@@ -80,7 +80,9 @@
       <p class="gpg">GPG: USERGPG</p>
       <a href="userprofile_USERNAME.png"><img id="qrcodepic" class="img-responsive" src="qrcodeicon.png"/></a>
       <p><button>Change Password</button></p>
+      <!-- remove user button -->
       <p><button>Remove</button></p>
+      <!-- end of remove user button -->
     </div>
 
   </body>