Login is still failing...
fixed merge conflicts