Modified the login (with bugs)