diff --git a/library/src/org/whispersystems/textsecure/directory/Directory.java b/library/src/org/whispersystems/textsecure/directory/Directory.java
index 989051b51e..d562e9cef8 100644
--- a/library/src/org/whispersystems/textsecure/directory/Directory.java
+++ b/library/src/org/whispersystems/textsecure/directory/Directory.java
@@ -25,9 +25,9 @@ import java.util.Set;
 public class Directory {
 
   private static final int INTRODUCED_CHANGE_FROM_TOKEN_TO_E164_NUMBER = 2;
-  private static final int DATABASE_VERSION = 2;
 
   private static final String DATABASE_NAME    = "whisper_directory.db";
+  private static final int    DATABASE_VERSION = 2;
 
   private static final String TABLE_NAME   = "directory";
   private static final String ID           = "_id";
@@ -37,11 +37,11 @@ public class Directory {
   private static final String SUPPORTS_SMS = "supports_sms";
   private static final String TIMESTAMP    = "timestamp";
   private static final String CREATE_TABLE = "CREATE TABLE " + TABLE_NAME + "(" + ID + " INTEGER PRIMARY KEY, " +
-      NUMBER + " TEXT UNIQUE, " +
-      REGISTERED + " INTEGER, " +
-      RELAY + " TEXT, " +
-      SUPPORTS_SMS + " INTEGER, " +
-      TIMESTAMP + " INTEGER);";
+                              NUMBER       + " TEXT UNIQUE, " +
+                              REGISTERED   + " INTEGER, " +
+                              RELAY        + " TEXT, " +
+                              SUPPORTS_SMS + " INTEGER, " +
+                              TIMESTAMP    + " INTEGER);";
 
   private static final Object instanceLock = new Object();
   private static volatile Directory instance;
@@ -226,7 +226,12 @@ public class Directory {
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
       if (oldVersion < INTRODUCED_CHANGE_FROM_TOKEN_TO_E164_NUMBER) {
         db.execSQL("DROP TABLE directory;");
-        onCreate(db);
+        db.execSQL("CREATE TABLE directory ( _id INTEGER PRIMARY KEY, " +
+                   "number TEXT UNIQUE, " +
+                   "registered INTEGER, " +
+                   "relay TEXT, " +
+                   "supports_sms INTEGER, " +
+                   "timestamp INTEGER);");
       }
     }
   }
diff --git a/res/values/strings.xml b/res/values/strings.xml
index abbef3a19e..b712e9b010 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -116,6 +116,9 @@
         settings, and messages...
     </string>
 
+    <!-- GroupCreateActivity -->
+    <string name="GroupCreateActivity_actionbar_title">New Group</string>
+
     <!-- ImportFragment -->
     <string name="ImportFragment_import_system_sms_database">Import System SMS Database?</string>
     <string name="ImportFragment_this_will_import_messages_from_the_system">This will import
diff --git a/src/org/thoughtcrime/securesms/GroupCreateActivity.java b/src/org/thoughtcrime/securesms/GroupCreateActivity.java
index afa4ed959d..7a8f883c6a 100644
--- a/src/org/thoughtcrime/securesms/GroupCreateActivity.java
+++ b/src/org/thoughtcrime/securesms/GroupCreateActivity.java
@@ -4,8 +4,11 @@ import android.app.Activity;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.util.Log;
 import android.view.View;
+import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.ListView;
 
@@ -39,9 +42,12 @@ public class GroupCreateActivity extends PassphraseRequiredSherlockFragmentActiv
   private final DynamicTheme    dynamicTheme    = new DynamicTheme();
   private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
 
+  private String defaultTitle;
+
   private static final int PICK_CONTACT = 1;
   private static final int PICK_AVATAR  = 2;
 
+  private EditText            groupName;
   private ListView            lv;
   private PushRecipientsPanel recipientsPanel;
   private ImageView           avatar;
@@ -52,11 +58,12 @@ public class GroupCreateActivity extends PassphraseRequiredSherlockFragmentActiv
   public void onCreate(Bundle state) {
     dynamicTheme.onCreate(this);
     dynamicLanguage.onCreate(this);
+    defaultTitle = getString(R.string.GroupCreateActivity_actionbar_title);
     super.onCreate(state);
 
     setContentView(R.layout.group_create_activity);
     getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-    ActionBarUtil.initializeDefaultActionBar(this, getSupportActionBar(), "New Group");
+    ActionBarUtil.initializeDefaultActionBar(this, getSupportActionBar(), defaultTitle);
 
     selectedContacts = new HashSet<Recipient>();
     initializeResources();
@@ -69,6 +76,21 @@ public class GroupCreateActivity extends PassphraseRequiredSherlockFragmentActiv
   }
 
   private void initializeResources() {
+    groupName = (EditText) findViewById(R.id.group_name);
+    groupName.addTextChangedListener(new TextWatcher() {
+      @Override
+      public void beforeTextChanged(CharSequence charSequence, int i, int i2, int i3) { }
+      @Override
+      public void onTextChanged(CharSequence charSequence, int i, int i2, int i3) { }
+      @Override
+      public void afterTextChanged(Editable editable) {
+        if (editable.length() > 0)
+          getSupportActionBar().setTitle(editable);
+        else
+          getSupportActionBar().setTitle(defaultTitle);
+      }
+    });
+
     lv = (ListView) findViewById(R.id.selected_contacts_list);
     lv.setAdapter(new SelectedRecipientsAdapter(this, android.R.id.text1, new ArrayList<Recipient>()));