CON-1446-user-login-menu | added cheking if user has default avatar and changing the icon respectively; done some cleanup