CI + A3M updates

Hybrid Auth replaces the current authentication system, fixes reset
password issues.