Check for nil client uid
Allow for a passed in client identifier
Add parameter to controller