Cleanup security login
Fix broken security UT test