Some edits for login