diff --git a/lms/djangoapps/onboarding/forms.py b/lms/djangoapps/onboarding/forms.py
index 64d4ae4536c6..52b22d0145dd 100644
--- a/lms/djangoapps/onboarding/forms.py
+++ b/lms/djangoapps/onboarding/forms.py
@@ -94,11 +94,12 @@ class UserInfoModelForm(BaseOnboardingModelForm):
                                widget=forms.RadioSelect)
 
     language = forms.CharField(label=ugettext_noop('Native Language'), label_suffix="*", required=True,
-                               error_messages={"required": ugettext_noop(EMPTY_FIELD_ERROR.format('Language'))})
-    country = forms.CharField(label="Country of Residence", label_suffix="*",
+                               error_messages={"required": ugettext_noop(EMPTY_FIELD_ERROR.format('Language'))},
+                               widget=forms.HiddenInput)
+    country = forms.CharField(label="Country of Residence", label_suffix="*", widget=forms.HiddenInput,
                               error_messages={"required": ugettext_noop(EMPTY_FIELD_ERROR.format("Country of Residence"))
     })
-    city = forms.CharField(label=ugettext_noop('City of Residence'), required=False)
+    city = forms.CharField(label=ugettext_noop('City of Residence'), required=False, widget=forms.HiddenInput)
     is_emp_location_different = forms.BooleanField(label=ugettext_noop('Check here if your country and/or city of '
                                                                        'employment is different from your country '
                                                                        'and/or city of residence.'),
@@ -210,12 +211,9 @@ class Meta:
         }
         widgets = {
             'year_of_birth': forms.TextInput,
-            'country': forms.TextInput(attrs={"autocomplete": "off"}),
             'not_listed_gender': forms.TextInput(attrs={'placeholder': ugettext_noop('Identify your gender here')}),
-            'city': forms.TextInput(attrs={"autocomplete": "off"}),
-            'language': forms.TextInput(attrs={"autocomplete": "off"}),
-            'country_of_employment': forms.TextInput(attrs={"autocomplete": "off"}),
-            'city_of_employment': forms.TextInput(attrs={"autocomplete": "off"}),
+            'country_of_employment': forms.HiddenInput,
+            'city_of_employment': forms.HiddenInput,
             'start_month_year': forms.TextInput(attrs={'placeholder': 'MM/YYYY'}),
             'hours_per_week': forms.NumberInput(attrs={'max': 168})
         }
@@ -425,8 +423,8 @@ class Meta:
                   'org_type', 'level_of_operation', 'total_employees', 'alternate_admin_email', 'partner_networks']
 
         widgets = {
-            'country': forms.TextInput(attrs={"autocomplete": "off"}),
-            'city': forms.TextInput(attrs={"autocomplete": "off"}),
+            'country': forms.HiddenInput,
+            'city': forms.HiddenInput,
             'url': forms.TextInput,
             'founding_year': forms.NumberInput,
             'alternate_admin_email': forms.TextInput,
@@ -811,7 +809,7 @@ class Meta:
             'effective_date': forms.TextInput,
             'total_clients': forms.NumberInput,
             'total_employees': forms.NumberInput,
-            'local_currency': forms.TextInput(attrs={"autocomplete": "off"}),
+            'local_currency': forms.HiddenInput,
             'total_revenue': forms.NumberInput,
             'total_donations': forms.NumberInput,
             'total_expenses': forms.NumberInput,
@@ -916,7 +914,7 @@ def clean_local_currency(self):
         currency_input = self.cleaned_data['local_currency']
 
         if can_provide_info and not currency_input in all_currency_codes:
-            raise forms.ValidationError(ugettext_noop('Please select currency code.'))
+            raise forms.ValidationError(ugettext_noop('Please select Currency Code.'))
 
         return currency_input
 
@@ -1019,7 +1017,7 @@ class Meta:
             'effective_date': forms.TextInput,
             'total_clients': forms.NumberInput,
             'total_employees': forms.NumberInput,
-            'local_currency': forms.TextInput,
+            'local_currency': forms.HiddenInput,
             'total_revenue': forms.NumberInput,
             'total_donations': forms.NumberInput,
             'total_expenses': forms.NumberInput,
diff --git a/openedx/core/djangoapps/user_api/views.py b/openedx/core/djangoapps/user_api/views.py
index df5e1308c0bd..47e18f5734f4 100644
--- a/openedx/core/djangoapps/user_api/views.py
+++ b/openedx/core/djangoapps/user_api/views.py
@@ -775,13 +775,12 @@ def _add_honor_code_field(self, form_desc, required=True):
             # Translators: This is a legal document users must agree to
             # in order to register a new account.
             terms_label = _(u"Terms of Service and Honor Code")
-            terms_link = marketing_link("HONOR")
-            terms_text = _(u"Click here to read the Terms and Conditions.")
+            terms_link = "https://philanthropyu.org/terms-of-use/"
+            terms_text = _(u"Terms of Use")
 
         # Translators: "Terms of Service" is a legal document users must agree to
         # in order to register a new account.
-        label = _(u"Terms and Agreement: By using this Site, you agree to be bound by,"
-                  u" and to comply with, these Terms and Conditions.")
+        label = _(u"Check here if you agree to be bound by, and to comply with, our ")
 
         # Translators: "Terms of Service" is a legal document users must agree to
         # in order to register a new account.