Login Issue fix