Updated shell to use  login routine