Merge nikolas ui + fix users.role reference