Fix for ticket 121

Add NAME keyword for users