Edwin : Added alternative login method