Ready for testing
Merge pull request #11 from GrahamHouse/Fix-for-login

Ready for testing