task #00015-Login_page: Minor fix
Merge branch '00015-Login_page' into develop