diff --git a/calexium_lib b/calexium_lib
index e861869..3306145 160000
--- a/calexium_lib
+++ b/calexium_lib
@@ -1 +1 @@
-Subproject commit e8618692387dc76379b129c0b3de63c3083f0277
+Subproject commit 3306145430afb6abfdae08e324b4002833eacd7e
diff --git a/densaku_lib b/densaku_lib
index 5c7cd86..e7fa05a 160000
--- a/densaku_lib
+++ b/densaku_lib
@@ -1 +1 @@
-Subproject commit 5c7cd864b6cc8232c2e719fe3a1e3740288cc0e2
+Subproject commit e7fa05a251e0fe746b9524e94b42b5093c4714bf
diff --git a/src/generation/html.anubis b/src/generation/html.anubis
index d9f58ac..b9ec2df 100644
--- a/src/generation/html.anubis
+++ b/src/generation/html.anubis
@@ -98,7 +98,9 @@ public define String
         integer_field(choices)              then to_HTML_cell_text(column, data_name, general_type_name),
         float_field                         then to_HTML_cell_text(column, data_name, general_type_name),
         char_field(choices, size)           then to_HTML_cell_text(column, data_name, general_type_name),
-        password_field(min_size)            then to_HTML_cell_text(column, data_name, general_type_name),
+        password_field(min_size)            then 
+            "text(\"********\")",
+          //to_HTML_cell_text(column, data_name, general_type_name),
         text_field(attrs)                   then to_HTML_cell_text(column, data_name, general_type_name),
       }
   }.
diff --git a/src/generation/web_args.anubis b/src/generation/web_args.anubis
index ed7b267..8591957 100644
--- a/src/generation/web_args.anubis
+++ b/src/generation/web_args.anubis
@@ -121,15 +121,21 @@ public define String
       else 
         "[]",
     foreign_key(_,_)                  then //"with "+name+" = get_DB_id(lwa, __prefix__+\""+name+"\"),",
-      "with "+name+"_fk = get_DB_id(lwa, __prefix__+\""+name+"\"), [field(\""+name+"\", bind_DB_id_or_NULL(\":v_"+name+"\", "+name+"))]"    
+      "with "+name+" = get_DB_id(lwa, __prefix__+\""+name+"\"), [field(\""+name+"\", bind_DB_id_or_NULL(\":v_"+name+"\", "+name+"))]"    
     integer_field(_)                  then //"get_Int(lwa, __prefix__+\""+name+"\")",
       "if get_Int(lwa, __prefix__+\""+name+"\") is {failure then [], success("+name+") then [field(\""+name+"\", bind_Int(\":v_"+name+"\", "+name+"))] }"    
     float_field                       then //"get_Float(lwa, __prefix__+\""+name+"\")",
       "if get_Float(lwa, __prefix__+\""+name+"\") is {failure then [], success("+name+") then [field(\""+name+"\", bind_Float(\":v_"+name+"\", "+name+"))] }"    
     char_field(_,_)                   then 
       "if get_String(lwa, __prefix__+\""+name+"\") is {failure then [], success("+name+") then [field(\""+name+"\", bind_String(\":v_"+name+"\", "+name+"))] }",
-    password_field(min_size)          then 
-      "if get_Password(lwa, __prefix__+\""+name+"_1\", __prefix__+\""+name+"_2\") is {failure then [], success("+name+") then [field(\""+name+"\", bind_String(\":v_"+name+"\", "+name+"))] }"
+    password_field(min_size)          then
+      "if get_String(lwa, \"password_pwd_change_option\", \"false\") = \"false\" then \n"+
+      "    if get_Password(lwa, __prefix__+\""+name+"_1\", __prefix__+\""+name+"_2\") is {failure then [], success("+name+") then [field(\""+name+"\", bind_String(\":v_"+name+"\", "+name+"))] }\n"+
+      "  else\n"+
+      "    if get_Bool(lwa, __prefix__+\""+name+"_pwd_change\") then \n"+
+      "      if get_Password(lwa, __prefix__+\""+name+"_1\", __prefix__+\""+name+"_2\") is {failure then [], success("+name+") then [field(\""+name+"\", bind_String(\":v_"+name+"\", "+name+"))] }\n"+   
+      "    else\n"+
+      "      []"
       // if get_Password(lwa, __prefix__+"password_1", __prefix__+"password_2")     is {failure then [], success(password) then [field("passwxord", bind_String(":v_password", password))] }
     text_field(_)                     then 
       "if get_String(lwa, __prefix__+\""+name+"\") is {failure then [], success("+name+") then [field(\""+name+"\", bind_String(\":v_"+name+"\", "+name+"))] }"
@@ -143,10 +149,10 @@ define String
   (
     List(HK_Model_Column) columns,
   )=
-  join(" ,\n",
+  join("+\n",
     map((HK_Model_Column col) |->
         since col is hk_column(name, col_type, _, _), 
-        from_web_arg_to_update_field(col_type, name),
+        "  "+from_web_arg_to_update_field(col_type, name),
       columns
     )
   )
--
libgit2 0.21.4