Merge branch 'hotfix/user_creation'
Changed name method to custom_label_method.
Merge branch 'hotfix/company_name' into develop