diff --git a/res/layout-sw400dp/fragment_enter_chat_url.xml b/res/layout-sw400dp/fragment_enter_chat_url.xml
index 8b1812b3d3..f3a7d4567f 100644
--- a/res/layout-sw400dp/fragment_enter_chat_url.xml
+++ b/res/layout-sw400dp/fragment_enter_chat_url.xml
@@ -16,7 +16,7 @@
         android:layout_marginLeft="@dimen/large_spacing"
         android:layout_marginTop="@dimen/large_spacing"
         android:layout_marginRight="@dimen/large_spacing"
-        android:hint="https://chat.lokinet.org" />
+        android:hint="https://chat.getsession.org" />
 
     <TextView
         android:layout_width="match_parent"
diff --git a/res/layout/activity_create_closed_group.xml b/res/layout/activity_create_closed_group.xml
index fa6585f797..d0c31bb112 100644
--- a/res/layout/activity_create_closed_group.xml
+++ b/res/layout/activity_create_closed_group.xml
@@ -14,9 +14,21 @@
         android:layout_marginLeft="@dimen/large_spacing"
         android:layout_marginTop="@dimen/medium_spacing"
         android:layout_marginRight="@dimen/large_spacing"
-        android:layout_marginBottom="@dimen/large_spacing"
         android:hint="Enter a group name" />
 
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/large_spacing"
+        android:layout_marginTop="@dimen/medium_spacing"
+        android:layout_marginRight="@dimen/large_spacing"
+        android:layout_marginBottom="@dimen/medium_spacing"
+        android:textSize="@dimen/small_font_size"
+        android:textColor="@color/text"
+        android:alpha="0.6"
+        android:textAlignment="center"
+        android:text="Closed groups are end-to-end encrypted group chats for up to 10 members. They provide the same privacy protections as one-on-one sessions." />
+
     <View
         android:layout_width="match_parent"
         android:layout_height="1px"
diff --git a/res/layout/fragment_enter_chat_url.xml b/res/layout/fragment_enter_chat_url.xml
index c1e2ccf23b..a228cc9bf7 100644
--- a/res/layout/fragment_enter_chat_url.xml
+++ b/res/layout/fragment_enter_chat_url.xml
@@ -16,7 +16,7 @@
         android:layout_marginLeft="@dimen/large_spacing"
         android:layout_marginTop="@dimen/large_spacing"
         android:layout_marginRight="@dimen/large_spacing"
-        android:hint="https://chat.lokinet.org" />
+        android:hint="https://chat.getsession.org" />
 
     <TextView
         android:layout_width="match_parent"
diff --git a/res/menu/conversation_push_group_options.xml b/res/menu/conversation_push_group_options.xml
index 4c75406455..2a7f2713da 100644
--- a/res/menu/conversation_push_group_options.xml
+++ b/res/menu/conversation_push_group_options.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <!-- <item android:id="@+id/menu_edit_group"
+    <item android:id="@+id/menu_edit_group"
           android:title="@string/conversation__menu_edit_group"
-          app:showAsAction="collapseActionView" /> -->
+          app:showAsAction="collapseActionView" />
 
     <item android:id="@+id/menu_leave"
           android:title="@string/conversation__menu_leave_group"
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index 4df60d9f3e..c180b5f054 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -874,7 +874,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     case R.id.menu_group_recipients:          handleDisplayGroupRecipients();                    return true;
     case R.id.menu_distribution_broadcast:    handleDistributionBroadcastEnabled(item);          return true;
     case R.id.menu_distribution_conversation: handleDistributionConversationEnabled(item);       return true;
-//    case R.id.menu_edit_group:                handleEditPushGroup();                             return true;
+    case R.id.menu_edit_group:                handleEditPushGroup();                             return true;
     case R.id.menu_leave:                     handleLeavePushGroup();                            return true;
     case R.id.menu_invite:                    handleInviteLink();                                return true;
     case R.id.menu_mute_notifications:        handleMuteNotifications();                         return true;
@@ -1172,9 +1172,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   }
 
   private void handleEditPushGroup() {
-    Intent intent = new Intent(ConversationActivity.this, GroupCreateActivity.class);
-    intent.putExtra(GroupCreateActivity.GROUP_ADDRESS_EXTRA, recipient.getAddress());
-    startActivityForResult(intent, GROUP_EDIT);
+    AlertDialog.Builder alert = new AlertDialog.Builder(this);
+    alert.setMessage("The ability to add members to a closed group is coming soon.");
+    alert.setPositiveButton("OK", (dialog, which) -> dialog.dismiss());
+    alert.create().show();
   }
 
   private void handleDistributionBroadcastEnabled(MenuItem item) {
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/CreateClosedGroupActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/CreateClosedGroupActivity.kt
index 034176745a..f6610df124 100644
--- a/src/org/thoughtcrime/securesms/loki/redesign/activities/CreateClosedGroupActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/CreateClosedGroupActivity.kt
@@ -95,8 +95,11 @@ class CreateClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberC
             return Toast.makeText(this, "Please enter a shorter group name", Toast.LENGTH_LONG).show()
         }
         val selectedMembers = this.selectedMembers
-        if (selectedMembers.count() < 1) {
-            return Toast.makeText(this, "Please pick at least 1 group member", Toast.LENGTH_LONG).show()
+        if (selectedMembers.count() < 2) {
+            return Toast.makeText(this, "Please pick at least 2 group members", Toast.LENGTH_LONG).show()
+        }
+        if (selectedMembers.count() > 10) {
+            return Toast.makeText(this, "A closed group cannot have more than 10 members", Toast.LENGTH_LONG).show()
         }
         val recipients = selectedMembers.map {
             Recipient.from(this, Address.fromSerialized(it), false)