diff --git a/source/ubl-settings-update.c b/source/ubl-settings-update.c
index c109c2f..9c1f5e8 100644
--- a/source/ubl-settings-update.c
+++ b/source/ubl-settings-update.c
@@ -1272,8 +1272,8 @@ void on_web_publish_accept(GtkWidget *, dictionary *dict){
     enable_browser?"listing":"",":",
     port_enabled?port:"",":",
     username_check?username:"",":",
-    username_check?!yon_char_is_empty(user_password)?user_password:"":"",":",
-    username_check?yon_char_is_empty(encryption)?"":encryption:"",
+    username_check?yon_char_is_empty(encryption)?user_password:encryption:"",":",
+    username_check?!yon_char_is_empty(user_password)&&!yon_char_is_empty(encryption)?user_password:"":"",
     NULL);
     if (!yon_char_is_empty(window->name)&&strcmp(final_name,window->name)){
         yon_config_remove_by_key(REPOPUBLIC_WEB_full(window->name));