diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
index e75015c3..2c1976f5 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
@@ -15,6 +15,8 @@ import android.support.v4.content.LocalBroadcastManager
 import android.view.inputmethod.InputMethodManager
 import android.text.InputType
 import android.text.TextWatcher
+import android.text.method.HideReturnsTransformationMethod
+import android.text.method.PasswordTransformationMethod
 import android.widget.*
 import android.view.*
 
@@ -956,6 +958,13 @@ class MainActivity : AppCompatActivity() {
                 .inflate(R.layout.password_dialog, findViewById(android.R.id.content) as ViewGroup,
                         false)
         val input = viewInflated.findViewById(R.id.password) as EditText
+        val checkBox = viewInflated.findViewById(R.id.checkbox) as CheckBox
+        checkBox.setOnCheckedChangeListener { buttonView, isChecked ->
+            if (isChecked)
+                input.transformationMethod = HideReturnsTransformationMethod()
+            else
+                input.transformationMethod = PasswordTransformationMethod()
+        }
         builder.setView(viewInflated)
         builder.setPositiveButton(android.R.string.ok) { dialog, _ ->
             dialog.dismiss()
@@ -986,6 +995,13 @@ class MainActivity : AppCompatActivity() {
                         .inflate(R.layout.password_dialog, findViewById(android.R.id.content) as ViewGroup,
                                 false)
                 val input = viewInflated.findViewById(R.id.password) as EditText
+                val checkBox = viewInflated.findViewById(R.id.checkbox) as CheckBox
+                checkBox.setOnCheckedChangeListener { buttonView, isChecked ->
+                    if (isChecked)
+                        input.transformationMethod = HideReturnsTransformationMethod()
+                    else
+                        input.transformationMethod = PasswordTransformationMethod()
+                }
                 builder.setView(viewInflated)
                 builder.setPositiveButton(android.R.string.ok) { dialog, _ ->
                     dialog.dismiss()
diff --git a/app/src/main/res/layout/password_dialog.xml b/app/src/main/res/layout/password_dialog.xml
index 0bc7ed19..ada147a0 100644
--- a/app/src/main/res/layout/password_dialog.xml
+++ b/app/src/main/res/layout/password_dialog.xml
@@ -8,14 +8,22 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <AutoCompleteTextView
+        <EditText
             android:id="@+id/password"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:importantForAutofill="no"
             android:hint="@string/password"
             android:imeOptions="actionDone"
             android:inputType="textPassword" />
 
+        <CheckBox
+            android:id="@+id/checkbox"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/show_password"
+            android:checked="false"/>
+
     </android.support.design.widget.TextInputLayout>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 1403c1d5..1952be53 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -358,4 +358,5 @@
         ilman Mikrofoni-käyttöoikeutta.
     </string>
     <string name="account_password">Tilin %1$s salasana</string>
+    <string name="show_password">Näytä salasana</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b72d673e..e7696f4e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -317,4 +317,5 @@
     </string>
     <string name="no_calls">You are not able to place or answer calls without Microphone permission.</string>
     <string name="account_password">Account %1$s Authentication Password</string>
+    <string name="show_password">Show Password</string>
 </resources>