More edits for Authentication