Some security optimizations to space admin controller