Converted to session based login