Fixed Login issue