#19 Updated login system