diff --git a/OpenEdXMobile/res/layout/activity_login.xml b/OpenEdXMobile/res/layout/activity_login.xml
index 2e965db577..567e7b716f 100755
--- a/OpenEdXMobile/res/layout/activity_login.xml
+++ b/OpenEdXMobile/res/layout/activity_login.xml
@@ -71,7 +71,7 @@
                         android:paddingStart="-4dp"
                         android:textColorHint="@color/grey_text">
 
-                        <android.support.design.widget.TextInputEditText
+                        <android.support.v7.widget.AppCompatEditText
                             android:id="@+id/email_et"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
@@ -91,7 +91,7 @@
                         android:paddingStart="-4dp"
                         android:textColorHint="@color/grey_text">
 
-                        <android.support.design.widget.TextInputEditText
+                        <android.support.v7.widget.AppCompatEditText
                             android:id="@+id/password_et"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
diff --git a/OpenEdXMobile/res/layout/reset_password_dialog.xml b/OpenEdXMobile/res/layout/reset_password_dialog.xml
index cb9f77bbd1..3c35e620bb 100644
--- a/OpenEdXMobile/res/layout/reset_password_dialog.xml
+++ b/OpenEdXMobile/res/layout/reset_password_dialog.xml
@@ -21,7 +21,7 @@
             android:hint="@string/email"
             app:errorEnabled="true">
 
-            <android.support.design.widget.TextInputEditText
+            <android.support.v7.widget.AppCompatEditText
                 android:id="@+id/email_edit_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
diff --git a/OpenEdXMobile/res/layout/view_register_edit_text.xml b/OpenEdXMobile/res/layout/view_register_edit_text.xml
index 34e000f6c5..44e37ec589 100755
--- a/OpenEdXMobile/res/layout/view_register_edit_text.xml
+++ b/OpenEdXMobile/res/layout/view_register_edit_text.xml
@@ -13,7 +13,7 @@
         android:layout_height="wrap_content"
         android:textColorHint="@color/grey_text">
 
-        <android.support.design.widget.TextInputEditText
+        <android.support.v7.widget.AppCompatEditText
             android:id="@+id/register_edit_text_tilEt"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/module/registration/view/RegistrationEditTextView.java b/OpenEdXMobile/src/main/java/org/edx/mobile/module/registration/view/RegistrationEditTextView.java
index e14c6e7a40..fcbb5d7c5f 100644
--- a/OpenEdXMobile/src/main/java/org/edx/mobile/module/registration/view/RegistrationEditTextView.java
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/module/registration/view/RegistrationEditTextView.java
@@ -1,9 +1,9 @@
 package org.edx.mobile.module.registration.view;
 
 import android.support.annotation.Nullable;
-import android.support.design.widget.TextInputEditText;
 import android.support.design.widget.TextInputLayout;
 import android.support.v4.view.ViewCompat;
+import android.support.v7.widget.AppCompatEditText;
 import android.text.Editable;
 import android.text.Html;
 import android.text.InputFilter;
@@ -26,7 +26,7 @@ public class RegistrationEditTextView implements IRegistrationFieldView {
     protected RegistrationFormField mField;
     private View mView;
     protected TextInputLayout mTextInputLayout;
-    protected TextInputEditText mTextInputEditText;
+    protected AppCompatEditText mEditText;
     protected TextView mInstructionsTextView;
     protected TextView mErrorTextView;
 
@@ -36,12 +36,12 @@ public RegistrationEditTextView(RegistrationFormField field, View view) {
         this.mView = view;
 
         mTextInputLayout = (TextInputLayout) view.findViewById(R.id.register_edit_text_til);
-        mTextInputEditText = (TextInputEditText) view.findViewById(R.id.register_edit_text_tilEt);
+        mEditText = (AppCompatEditText) view.findViewById(R.id.register_edit_text_tilEt);
         mInstructionsTextView = (TextView) view.findViewById(R.id.input_instructions);
         mErrorTextView = (TextView) view.findViewById(R.id.input_error);
 
         // set max lines for this input to be 1
-        mTextInputEditText.setLines(1);
+        mEditText.setLines(1);
 
         // apply max length
         if (mField.getRestriction().getMaxLength() > 0) {
@@ -49,7 +49,7 @@ public RegistrationEditTextView(RegistrationFormField field, View view) {
 
             InputFilter[] FilterArray = new InputFilter[1];
             FilterArray[0] = new InputFilter.LengthFilter(mField.getRestriction().getMaxLength());
-            mTextInputEditText.setFilters(FilterArray);
+            mEditText.setFilters(FilterArray);
         }
 
         setInstructions(field.getInstructions());
@@ -58,7 +58,7 @@ public RegistrationEditTextView(RegistrationFormField field, View view) {
         mTextInputLayout.setHint(mField.getLabel());
 
         // set default
-        mTextInputEditText.setText(mField.getDefaultValue());
+        mEditText.setText(mField.getDefaultValue());
 
         // hide error text view
         mErrorTextView.setVisibility(View.GONE);
@@ -68,11 +68,11 @@ public RegistrationEditTextView(RegistrationFormField field, View view) {
 
         // Do a11y adjustment
         mTextInputLayout.setContentDescription(String.format("%s. %s.", mField.getLabel(), field.getInstructions()));
-        mTextInputEditText.setContentDescription(mField.getLabel());
+        mEditText.setContentDescription(mField.getLabel());
         ViewCompat.setImportantForAccessibility(mInstructionsTextView, ViewCompat.IMPORTANT_FOR_ACCESSIBILITY_NO);
 
         // Add text change listener
-        mTextInputEditText.addTextChangedListener(new TextWatcher() {
+        mEditText.addTextChangedListener(new TextWatcher() {
             /*
              TextWatcher events also trigger at time of registration of this listener. Which we
              don't want in this case. So, to handle it, a flag is required to check if the text
@@ -102,19 +102,19 @@ public void afterTextChanged(Editable s) {
     }
 
     public boolean setRawValue(String value){
-        mTextInputEditText.setText(value);
+        mEditText.setText(value);
         return true;
     }
 
     @Override
     public JsonElement getCurrentValue() {
         // turn text view content into a JsonElement and return it
-        return new JsonPrimitive(mTextInputEditText.getText().toString());
+        return new JsonPrimitive(mEditText.getText().toString());
     }
 
     @Override
     public boolean hasValue() {
-        return !mTextInputEditText.getText().toString().isEmpty();
+        return !mEditText.getText().toString().isEmpty();
     }
 
     @Override
@@ -210,8 +210,8 @@ public void setActionListener(IActionListener actionListener) {
     }
 
     public void setEditTextFocusable(boolean focusable) {
-        mTextInputEditText.setFocusable(focusable);
-        mTextInputEditText.setFocusableInTouchMode(focusable);
+        mEditText.setFocusable(focusable);
+        mEditText.setFocusableInTouchMode(focusable);
     }
 
     @Override
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/module/registration/view/RegistrationEmailView.java b/OpenEdXMobile/src/main/java/org/edx/mobile/module/registration/view/RegistrationEmailView.java
index 857e2c3c9a..4953b747e4 100644
--- a/OpenEdXMobile/src/main/java/org/edx/mobile/module/registration/view/RegistrationEmailView.java
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/module/registration/view/RegistrationEmailView.java
@@ -14,7 +14,7 @@ class RegistrationEmailView extends RegistrationEditTextView {
 
     public RegistrationEmailView(RegistrationFormField field, View view) {
         super(field, view);
-        mTextInputEditText.setInputType(InputType.TYPE_CLASS_TEXT
+        mEditText.setInputType(InputType.TYPE_CLASS_TEXT
                 | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
     }
 
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/module/registration/view/RegistrationPasswordView.java b/OpenEdXMobile/src/main/java/org/edx/mobile/module/registration/view/RegistrationPasswordView.java
index b928ae6c21..ed338baae0 100644
--- a/OpenEdXMobile/src/main/java/org/edx/mobile/module/registration/view/RegistrationPasswordView.java
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/module/registration/view/RegistrationPasswordView.java
@@ -12,7 +12,7 @@ class RegistrationPasswordView extends RegistrationEditTextView {
 
     public RegistrationPasswordView(RegistrationFormField field, View view) {
         super(field, view);
-        mTextInputEditText.setInputType(InputType.TYPE_CLASS_TEXT
+        mEditText.setInputType(InputType.TYPE_CLASS_TEXT
                 | InputType.TYPE_TEXT_VARIATION_PASSWORD
                 | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
     }
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/module/registration/view/RegistrationTextAreaView.java b/OpenEdXMobile/src/main/java/org/edx/mobile/module/registration/view/RegistrationTextAreaView.java
index f3c5fd94a6..447c20dd9a 100644
--- a/OpenEdXMobile/src/main/java/org/edx/mobile/module/registration/view/RegistrationTextAreaView.java
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/module/registration/view/RegistrationTextAreaView.java
@@ -15,13 +15,13 @@ class RegistrationTextAreaView extends RegistrationEditTextView {
     public RegistrationTextAreaView(RegistrationFormField field, View view) {
         super(field, view);
 
-        mTextInputEditText.setLines(INIT_LINES);
-        mTextInputEditText.setMaxLines(MAX_LINES);
+        mEditText.setLines(INIT_LINES);
+        mEditText.setMaxLines(MAX_LINES);
 
         // allow multiline text
-        mTextInputEditText.setInputType(InputType.TYPE_CLASS_TEXT
+        mEditText.setInputType(InputType.TYPE_CLASS_TEXT
                 | InputType.TYPE_TEXT_FLAG_MULTI_LINE);
         // text should start from the left-top
-        mTextInputEditText.setGravity(Gravity.START | Gravity.TOP);
+        mEditText.setGravity(Gravity.START | Gravity.TOP);
     }
 }
diff --git a/OpenEdXMobile/src/main/java/org/edx/mobile/module/registration/view/RegistrationTextView.java b/OpenEdXMobile/src/main/java/org/edx/mobile/module/registration/view/RegistrationTextView.java
index e33fe31087..9ca763a5b8 100644
--- a/OpenEdXMobile/src/main/java/org/edx/mobile/module/registration/view/RegistrationTextView.java
+++ b/OpenEdXMobile/src/main/java/org/edx/mobile/module/registration/view/RegistrationTextView.java
@@ -12,6 +12,6 @@ class RegistrationTextView extends RegistrationEditTextView {
 
     public RegistrationTextView(RegistrationFormField field, View view) {
         super(field, view);
-        mTextInputEditText.setInputType(InputType.TYPE_CLASS_TEXT);
+        mEditText.setInputType(InputType.TYPE_CLASS_TEXT);
     }
 }