diff --git a/entrypoint.sh b/entrypoint.sh
index dd2dd5a3a0..a249d469c9 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,6 +1,14 @@
 #!/bin/sh
 
-useradd -r -u ${LOCAL_UID:-999} -g bitwarden bitwarden
+NOUSER=`id -u bitwarden > /dev/null 2>&1; echo $?`
+LUID=${LOCAL_UID:-999}
+if [[ $NOUSER == 0 && `id -u bitwarden` != $LUID ]]
+then
+    usermod -u $LUID bitwarden
+elif [ $NOUSER == 1 ]
+then
+    useradd -r -u $LUID -g bitwarden bitwarden
+fi
 
 chown -R bitwarden:bitwarden /etc/bitwarden
 cp /etc/bitwarden/web/settings.js /app/js/settings.js