reverted user login to app-basic-default
Merge branch '4.0' of https://github.com/phundament/app into 4.0