Login/ Logout changes after merge.. Fingers crossed..