Soft coded uaa  (fix)