Basic Functionality Restoration

user login changes broke basic functionality this is the restoration of
it.