BUG fix
working version with login