Added login work around