- Fix LoginSecurity NPE
- Remove temp admin impl label
- Other misc changes