few more bug fixes on handling the login and enable functions