Josh's php fixes

fixes login
Merge remote-tracking branch 'origin/Alex'