Fixed problem with context and login