diff --git a/entrypoint.sh b/entrypoint.sh
index 92e3aa887d7..1986050e7ac 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -18,6 +18,11 @@ then
     useradd -r -u $LUID -g $USERNAME $USERNAME
 fi
 
+if [ ! -d "/home/$USERNAME" ]
+then
+    mkhomedir_helper $USERNAME
+fi
+
 chown -R $USERNAME:$USERNAME /etc/bitwarden
 cp /etc/bitwarden/web/settings.js /app/js/settings.js
 cp /etc/bitwarden/web/app-id.json /app/app-id.json