diff --git a/EmailAuth/FirebaseEmailAuthUI/FUIPasswordSignUpViewController.m b/EmailAuth/FirebaseEmailAuthUI/FUIPasswordSignUpViewController.m
index c425512c7e2..f41e3aa4a27 100755
--- a/EmailAuth/FirebaseEmailAuthUI/FUIPasswordSignUpViewController.m
+++ b/EmailAuth/FirebaseEmailAuthUI/FUIPasswordSignUpViewController.m
@@ -280,6 +280,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView
     _nameField.secureTextEntry = NO;
     _nameField.returnKeyType = UIReturnKeyNext;
     _nameField.keyboardType = UIKeyboardTypeDefault;
+    _nameField.autocapitalizationType = UITextAutocapitalizationTypeWords;
     if (@available(iOS 10.0, *)) {
       _nameField.textContentType = UITextContentTypeName;
     }