Fix Login issue