Added some missed changes in login/context