diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterFragment.kt
index 6a052bcc..13982132 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterFragment.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterFragment.kt
@@ -23,6 +23,7 @@ import android.support.v7.widget.Toolbar
 import android.view.*
 import android.widget.EditText
 import android.widget.Toast
+import be.mygod.vpnhotspot.App.Companion.app
 import be.mygod.vpnhotspot.databinding.FragmentRepeaterBinding
 import be.mygod.vpnhotspot.databinding.ListitemClientBinding
 import be.mygod.vpnhotspot.net.IpNeighbour
@@ -172,6 +173,8 @@ class RepeaterFragment : Fragment(), ServiceConnection, Toolbar.OnMenuItemClickL
         binding.swipeRefresher.setColorSchemeResources(R.color.colorAccent)
         binding.swipeRefresher.setOnRefreshListener {
             IpNeighbourMonitor.instance?.flush()
+            val binder = binder
+            if (binder?.active == false) binder.requestGroupUpdate()
             adapter.recreate()
         }
         binding.toolbar.inflateMenu(R.menu.repeater)
@@ -248,7 +251,7 @@ class RepeaterFragment : Fragment(), ServiceConnection, Toolbar.OnMenuItemClickL
                 dialog = WifiP2pDialog(context, DialogInterface.OnClickListener { _, which ->
                     when (which) {
                         DialogInterface.BUTTON_POSITIVE -> when (conf.update(dialog!!.config!!)) {
-                            true -> binder.requestGroupUpdate()
+                            true -> app.handler.postDelayed(binder::requestGroupUpdate, 1000)
                             false -> Toast.makeText(context, R.string.noisy_su_failure, Toast.LENGTH_SHORT).show()
                             null -> Toast.makeText(context, R.string.root_unavailable, Toast.LENGTH_SHORT).show()
                         }
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt b/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt
index 3093970c..82299f73 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt
@@ -97,7 +97,7 @@ class RepeaterService : Service(), WifiP2pManager.ChannelListener, VpnMonitor.Ca
     var group: WifiP2pGroup? = null
         private set(value) {
             field = value
-            binder.data?.onGroupChanged(group)
+            binder.data?.onGroupChanged(value)
         }
     private val binder = RepeaterBinder()
     private var receiverRegistered = false
diff --git a/mobile/src/main/res/layout/dialog_wifi_ap.xml b/mobile/src/main/res/layout/dialog_wifi_ap.xml
index 77adb6bc..144ace3e 100644
--- a/mobile/src/main/res/layout/dialog_wifi_ap.xml
+++ b/mobile/src/main/res/layout/dialog_wifi_ap.xml
@@ -44,7 +44,7 @@
                           android:layout_height="wrap_content"
                           style="@style/wifi_item_edit_content"
                           android:hint="@string/wifi_ssid_hint"
-                          android:inputType="textNoSuggestions"
+                          android:inputType="textMultiLine|textNoSuggestions"
                           android:maxLength="32" />
             </LinearLayout>
         </LinearLayout>