#45 refact for login page