MB-135 #users.sql refactored