task #00014-User_login_form: Minor fix
Merge branch '00014-User_login_form' into develop