diff --git a/app/src/main/java/io/syng/activity/BaseActivity.java b/app/src/main/java/io/syng/activity/BaseActivity.java
index 3d29286..c1effd1 100644
--- a/app/src/main/java/io/syng/activity/BaseActivity.java
+++ b/app/src/main/java/io/syng/activity/BaseActivity.java
@@ -18,6 +18,7 @@ import android.support.v7.widget.Toolbar;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextWatcher;
+import android.util.Patterns;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
@@ -374,7 +375,7 @@ public abstract class BaseActivity extends AppCompatActivity implements
     }
 
     private void showAccountCreateDialog() {
-        new MaterialDialog.Builder(this)
+        MaterialDialog dialog = new MaterialDialog.Builder(this)
                 .title("New account")
                 .content("Put your name to create new account")
                 .inputType(InputType.TYPE_CLASS_TEXT)
@@ -388,6 +389,7 @@ public abstract class BaseActivity extends AppCompatActivity implements
                         mAccountDrawerAdapter.notifyDataSetChanged();
                     }
                 }).show();
+        dialog.getInputEditText().setSingleLine();
     }
 
 
@@ -555,10 +557,17 @@ public abstract class BaseActivity extends AppCompatActivity implements
                     public void onPositive(MaterialDialog dialog) {
                         EditText dappNameEdit = (EditText) dialog.findViewById(R.id.dapp_name);
                         EditText dappUrlEdit = (EditText) dialog.findViewById(R.id.dapp_url);
-                        dapp.setName(dappNameEdit.getText().toString());
-                        dapp.setUrl(dappUrlEdit.getText().toString());
-                        SyngApplication.updateDapp(dapp);
-                        initDApps();
+                        String url = dappUrlEdit.getText().toString();
+                        if (Patterns.WEB_URL.matcher(url.replace("dapp://", "http://")).matches()) {
+                            dapp.setName(dappNameEdit.getText().toString());
+                            dapp.setUrl(url);
+                            System.out.println(url);
+                            SyngApplication.updateDapp(dapp);
+                            initDApps();
+                            dialog.hide();
+                        } else {
+                            Toast.makeText(BaseActivity.this, R.string.invalid_url, Toast.LENGTH_SHORT).show();
+                        }
                     }
 
                     @Override
@@ -566,6 +575,7 @@ public abstract class BaseActivity extends AppCompatActivity implements
                         dialog.hide();
                     }
                 })
+                .autoDismiss(false)
                 .build();
         EditText dappNameEdit = (EditText) dialog.findViewById(R.id.dapp_name);
         dappNameEdit.setText(dapp.getName());
@@ -585,7 +595,7 @@ public abstract class BaseActivity extends AppCompatActivity implements
                     public void onInput(MaterialDialog dialog, CharSequence input) {
                         profile.setName(input.toString());
                         PrefsUtil.updateProfile(profile);
-                        for (Profile item: mProfiles) {
+                        for (Profile item : mProfiles) {
                             if (item.getId().equals(profile.getId())) {
                                 int index = mProfiles.indexOf(item);
                                 mProfiles.set(index, profile);
@@ -598,6 +608,7 @@ public abstract class BaseActivity extends AppCompatActivity implements
                         }
                     }
                 }).show();
+        dialog.getInputEditText().setSingleLine();
         dialog.getInputEditText().setText(profile.getName());
     }
 
@@ -614,10 +625,17 @@ public abstract class BaseActivity extends AppCompatActivity implements
                     public void onPositive(MaterialDialog dialog) {
                         EditText dappNameEdit = (EditText)dialog.findViewById(R.id.dapp_name);
                         EditText dappUrlEdit = (EditText)dialog.findViewById(R.id.dapp_url);
-                        Dapp dapp = new Dapp(dappNameEdit.getText().toString());
-                        dapp.setUrl(dappUrlEdit.getText().toString());
-                        SyngApplication.addDapp(dapp);
-                        initDApps();
+                        String url = dappUrlEdit.getText().toString();
+                        if (Patterns.WEB_URL.matcher(url.replace("dapp://", "http://")).matches()) {
+                            Dapp dapp = new Dapp(dappNameEdit.getText().toString());
+                            dapp.setUrl(dappUrlEdit.getText().toString());
+                            SyngApplication.addDapp(dapp);
+                            initDApps();
+                            dialog.hide();
+                        } else {
+                            Toast.makeText(BaseActivity.this, R.string.invalid_url, Toast.LENGTH_SHORT).show();
+                        }
+
                     }
 
                     @Override
@@ -625,6 +643,7 @@ public abstract class BaseActivity extends AppCompatActivity implements
                         dialog.hide();
                     }
                 })
+                .autoDismiss(false)
                 .build().show();
     }
 
diff --git a/app/src/main/java/io/syng/entity/Profile.java b/app/src/main/java/io/syng/entity/Profile.java
index 517af3a..28c94ac 100644
--- a/app/src/main/java/io/syng/entity/Profile.java
+++ b/app/src/main/java/io/syng/entity/Profile.java
@@ -60,12 +60,12 @@ public class Profile implements Serializable {
 
         // Add wallet dapp
         Dapp wallet = new Dapp("Wallet");
-        wallet.setUrl("http://syng.io/dapps/wallet");
+        wallet.setUrl("dapp://syng.io/dapps/wallet");
         dapps.add(wallet);
 
         // Add contacts dapp
         Dapp contacts = new Dapp("Contacts");
-        contacts.setUrl("http://syng.io/dapps/contacts");
+        contacts.setUrl("dapp://syng.io/dapps/contacts");
         dapps.add(contacts);
     }
 
diff --git a/app/src/main/res/layout/dapp_form.xml b/app/src/main/res/layout/dapp_form.xml
index 5515214..55091ab 100644
--- a/app/src/main/res/layout/dapp_form.xml
+++ b/app/src/main/res/layout/dapp_form.xml
@@ -11,6 +11,7 @@
             android:id="@+id/dapp_name"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:singleLine="true"
             android:hint="@string/name" />
     <!--</android.support.design.widget.TextInputLayout>-->
 
@@ -21,6 +22,7 @@
             android:id="@+id/dapp_url"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:singleLine="true"
             android:hint="@string/url" />
     <!--</android.support.design.widget.TextInputLayout>-->
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cf2d98e..83b70a6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -28,6 +28,8 @@
     <string name="error_reading_file">Error reading specified file.</string>
     <string name="invalid_wallet_password">Invalid wallet or password.</string>
 
+    <string name="invalid_url">Invalid url.</string>
+
     <string name="request_profile_password">Profile Password</string>
     <string name="warning.message">This is PRE-ALPHA software and most likely contains numerous bugs. The layout, design, and functionality may change frequently. This also lacks numerous features that will be included in later versions. Using this software you agree that you hold yourself personally accountable for interacting with this software.</string>
     <string name="warning.title">WARNING</string>