fixed some login issues
Merge branch 'smokescreen' of https://github.com/BlackBox3750/System into smokescreen