added login, bugfix