Initial changes for creating a normal login