diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp
index 4010c9da6..4c5045983 100644
--- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp
+++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp
@@ -150,6 +150,7 @@ void GxsGroupDialog::initMode()
 		case MODE_CREATE:
 		{
 			ui.buttonBox->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+                        ui.buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Create Forum"));
 			newGroup();
 		}
 		break;
diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.cpp
index 26b6855c0..9ee7a877f 100644
--- a/retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.cpp
+++ b/retroshare-gui/src/gui/gxsforums/GxsForumGroupDialog.cpp
@@ -72,17 +72,16 @@ void GxsForumGroupDialog::initUi()
 	switch (mode())
 	{
 	case MODE_CREATE:
-		setUiText(UITYPE_SERVICE_HEADER, tr("Create New Forum"));
+                setUiText(UITYPE_SERVICE_HEADER, tr("Create New Forum"));
 		break;
 	case MODE_SHOW:
 		setUiText(UITYPE_SERVICE_HEADER, tr("Forum"));
+
 		break;
 	case MODE_EDIT:
 		setUiText(UITYPE_SERVICE_HEADER, tr("Edit Forum"));
 		break;
-	}
-	
-  setUiText(UITYPE_BUTTONBOX_OK, tr("Create Forum"));
+        }
 }
 
 QPixmap GxsForumGroupDialog::serviceImage()