Bugfix to login view
merged with login fix