diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigFamilyHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigFamilyHandler.java
index c864c0b01..2dc13fe0f 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigFamilyHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigFamilyHandler.java
@@ -24,7 +24,7 @@ public class ConfigFamilyHandler extends FormHandler {
     @Override
     protected void processForm() {
 
-        if (_action.equals(_t("Create Router Family"))) {
+        if (_action.equals(_t("Create New Router Family"))) {
             String family = getJettyString("family");
             String old = _context.getProperty(FamilyKeyCrypto.PROP_FAMILY_NAME);
             if (family == null || family.trim().length() <= 0) {
@@ -39,7 +39,7 @@ public class ConfigFamilyHandler extends FormHandler {
             } else {
                 addFormError(_t("Error saving the configuration (applied but not saved) - please see the error logs"));
             }
-        } else if (_action.equals(_t("Join Router Family"))) {
+        } else if (_action.equals(_t("Join Existing Router Family"))) {
             InputStream in = _requestWrapper.getInputStream("file");
             try {
                 // non-null but zero bytes if no file entered, don't know why
diff --git a/history.txt b/history.txt
index 78db8e201..3855f747a 100644
--- a/history.txt
+++ b/history.txt
@@ -1,8 +1,14 @@
+2016-05-29 zzz
+ * Console: Fix /configfamily form (ticket #1797)
+
 2016-05-29 str4d
  * CertUtil: Dynamically load javax.naming classes to avoid
    VerifyErrors on some Androids
  * LogWriter: Dynamically load Android writer
 
+2016-05-26 zzz
+ * Build: Launchpad build fixes
+
 2016-05-25 zzz
  * DesktopGui: Add monochrome icons for Windows and Mac
  * Reseed:
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 31c35f8c3..ea17ad55f 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 14;
+    public final static long BUILD = 15;
 
     /** for example "-test" */
     public final static String EXTRA = "";