diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/SettingsActivity.java b/claimManagement/src/main/java/org/openimis/imisclaims/SettingsActivity.java
index ef35f331..801c1139 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/SettingsActivity.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/SettingsActivity.java
@@ -20,7 +20,6 @@ public class SettingsActivity extends ImisActivity {
     EditText etRarPassword;
     private String salt, password;
     public static String generatedSalt;
-    Global global;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
diff --git a/claimManagement/src/main/res/layout/settings.xml b/claimManagement/src/main/res/layout/settings.xml
index 05bd3e51..623a3652 100644
--- a/claimManagement/src/main/res/layout/settings.xml
+++ b/claimManagement/src/main/res/layout/settings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -14,15 +15,20 @@
         android:layout_marginTop="10dp"
         android:text="@string/RarPassword" />
 
-    <EditText
-        android:id="@+id/rarPassword"
+    <com.google.android.material.textfield.TextInputLayout
         android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:paddingLeft="10dp"
+        android:layout_height="wrap_content"
         android:layout_marginLeft="20dp"
         android:layout_marginRight="20dp"
-        android:inputType="textPassword">
-    </EditText>
+        app:endIconMode="password_toggle">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/rarPassword"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:paddingLeft="10dp"
+            android:inputType="textPassword|textNoSuggestions" />
+    </com.google.android.material.textfield.TextInputLayout>
 
     <LinearLayout android:id="@+id/llSaveRarButton"
         android:layout_width="match_parent"
@@ -61,4 +67,4 @@
             android:text="@string/SaveRarPassword" />
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>