Reworked the Login mechanisms
Getting ready for new release