Fix user admin object creation and deletion; #931, #2288

Fix user admin object creation and deletion; #931, #2288 #5671