Made login also more bearable