OOIION-1569 Production Login Capabilities Restored R2