More changes for control panel direct login