All changes to get login working
Merge pull request #2 from empowerchris/sid

All changes to get login working