diff --git a/entrypoint.sh b/entrypoint.sh
index f3e7c58..617cb59 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -310,7 +310,8 @@ zulipConfiguration() {
             [ "$setting_key" = "ZULIP_ADMINISTRATOR" ] || [ "$setting_key" = "ADMIN_DOMAIN" ] || \
             [ "$setting_key" = "SECRET_KEY" ] || [ "$setting_key" = "NOREPLY_EMAIL_ADDRESS" ] || \
             [ "$setting_key" = "DEFAULT_FROM_EMAIL" ] || [ "$setting_key" = "ALLOWED_HOSTS" ] || \
-            [[ "$setting_key" = AUTH_* ]] || [[ "$setting_key" = LDAP_* ]]; then
+            [[ "$setting_key" = AUTH_* ]] || [[ "$setting_key" = LDAP_* ]] || \
+            [[ "$setting_key" = EMAIL* ]] ; then
             file="$SETTINGS_PY"
         fi
         if [ "$setting_key" = "AUTH_LDAP_USER_SEARCH" ] || [ "$setting_key" = "AUTH_LDAP_USER_ATTR_MAP" ] || \
@@ -321,6 +322,9 @@ zulipConfiguration() {
         if ([ "$SPECIAL_SETTING_DETECTION_MODE" = "True" ] || [ "$SPECIAL_SETTING_DETECTION_MODE" = "true" ]) || [ "$type" = "string" ]; then
             type=""
         fi
+        if [ "$setting_key" = "EMAIL_HOST_USER"  ] || [ "$setting_key" = "EMAIL_HOST_PASSWORD" ]; then
+            type="string"
+        fi
         setConfigurationValue "$setting_key" "$setting_var" "$file" "$type"
     done
     unset setting_key setting_var