Modified session and login scope