Fixing code style
Adding System User feature