diff --git a/app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt
index c5a7a414..e414f02b 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt
@@ -71,7 +71,11 @@ class ContactActivity : AppCompatActivity() {
 
             R.id.checkIcon -> {
 
-                val newName = nameView.text.toString().trim()
+                var newName = nameView.text.toString().trim()
+                var newUri = uriView.text.toString().trim()
+
+                if (newName == "") newName = newUri
+
                 if (!Utils.checkName(newName)) {
                     Utils.alertView(this, getString(R.string.error),
                             String.format(getString(R.string.invalid_contact), newName))
@@ -89,7 +93,6 @@ class ContactActivity : AppCompatActivity() {
                     return false
                 }
 
-                var newUri = uriView.text.toString().trim()
                 if (!newUri.startsWith("sip:")) {
                     if (newUri.contains("@") || (BaresipService.uas.size != 1)) {
                         newUri = "sip:$newUri"
diff --git a/app/src/main/kotlin/com/tutpro/baresip/Utils.kt b/app/src/main/kotlin/com/tutpro/baresip/Utils.kt
index 2d3e6dc5..7244ec0c 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/Utils.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/Utils.kt
@@ -214,11 +214,8 @@ object Utils {
     }
 
     fun checkName(name: String): Boolean {
-        if (name.length < 2) return false
-        for (c in name) {
-            if (!c.isLetterOrDigit() && !(c in "-.!%*_+`'~ ")) return false
-        }
-        return true
+        return name.isNotEmpty() && name == String(name.toByteArray(), Charsets.UTF_8) &&
+                name.lines().size == 1
     }
 
     fun checkIfName(name: String): Boolean {