task #00019-User_page: Minor fix
Merge branch '00019-User_page' into develop