Added logic for remember me token