Fixed bug with same user and system user names