diff --git a/app/src/main/java/protect/card_locker/ImportExportActivity.java b/app/src/main/java/protect/card_locker/ImportExportActivity.java
index c5ee29759..40f565010 100644
--- a/app/src/main/java/protect/card_locker/ImportExportActivity.java
+++ b/app/src/main/java/protect/card_locker/ImportExportActivity.java
@@ -20,7 +20,6 @@ import android.widget.Toast;
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -92,7 +91,7 @@ public class ImportExportActivity extends CatimaAppCompatActivity
             public void onClick(View v)
             {
                 AlertDialog.Builder builder = new AlertDialog.Builder(ImportExportActivity.this);
-                builder.setTitle(R.string.exportPasswordRequired);
+                builder.setTitle(R.string.exportPassword);
 
                 FrameLayout container = new FrameLayout(ImportExportActivity.this);
                 FrameLayout.LayoutParams params = new  FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
@@ -102,7 +101,7 @@ public class ImportExportActivity extends CatimaAppCompatActivity
                 final EditText input = new EditText(ImportExportActivity.this);
                 input.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
                 input.setLayoutParams(params);
-                input.setHint("Enter Password");
+                input.setHint(R.string.exportPasswordHint);
 
                 container.addView(input);
                 builder.setView(container);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d45c44099..817ffee8e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -196,7 +196,8 @@
     <string name="yes">Yes</string>
     <string name="no">No</string>
     <string name="passwordRequired">Please enter the password</string>
-    <string name="exportPasswordRequired">Set a password to protect your export."</string>
+    <string name="exportPassword">Set a password to protect your export(optional)"</string>
+    <string name="exportPasswordHint">Enter Password</string>
     <string name="failedGeneratingShareURL">Could not generate sharable URL. Please report this.</string>
     <string name="turn_flashlight_on">Turn flashlight on</string>
     <string name="turn_flashlight_off">Turn flashlight off</string>