diff --git a/src/component-index.js b/src/component-index.js
index d6873c6dfd..ed538a6fcb 100644
--- a/src/component-index.js
+++ b/src/component-index.js
@@ -99,6 +99,8 @@ import views$dialogs$SetDisplayNameDialog from './components/views/dialogs/SetDi
 views$dialogs$SetDisplayNameDialog && (module.exports.components['views.dialogs.SetDisplayNameDialog'] = views$dialogs$SetDisplayNameDialog);
 import views$dialogs$TextInputDialog from './components/views/dialogs/TextInputDialog';
 views$dialogs$TextInputDialog && (module.exports.components['views.dialogs.TextInputDialog'] = views$dialogs$TextInputDialog);
+import views$dialogs$TextInputWithCheckboxDialog from './components/views/dialogs/TextInputWithCheckboxDialog';
+views$dialogs$TextInputWithCheckboxDialog && (module.exports.components['views.dialogs.TextInputWithCheckboxDialog'] = views$dialogs$TextInputWithCheckboxDialog);
 import views$dialogs$UnknownDeviceDialog from './components/views/dialogs/UnknownDeviceDialog';
 views$dialogs$UnknownDeviceDialog && (module.exports.components['views.dialogs.UnknownDeviceDialog'] = views$dialogs$UnknownDeviceDialog);
 import views$elements$AccessibleButton from './components/views/elements/AccessibleButton';
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index b449ff3094..d87ca203ce 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -191,6 +191,10 @@ module.exports = React.createClass({
         return this.props.config.default_is_url || "https://vector.im";
     },
 
+    getDefaultFederate() {
+        return this.props.config.default_federate && true;
+    },
+
     componentWillMount: function() {
         SdkConfig.put(this.props.config);
 
@@ -501,15 +505,20 @@ module.exports = React.createClass({
                 //this._setPage(PageTypes.CreateRoom);
                 //this.notifyNewScreen('new');
 
-                var TextInputDialog = sdk.getComponent("dialogs.TextInputDialog");
-                Modal.createDialog(TextInputDialog, {
+                var TextInputWithCheckboxDialog = sdk.getComponent("dialogs.TextInputWithCheckboxDialog");
+                Modal.createDialog(TextInputWithCheckboxDialog, {
                     title: "Create Room",
                     description: "Room name (optional)",
                     button: "Create Room",
-                    onFinished: (should_create, name) => {
+                    check: this.getDefaultFederate(),
+                    checkLabel: "Federate room in domain " + MatrixClientPeg.get().getDomain(),
+                    onFinished: (should_create, name, isFederate) => {
                         if (should_create) {
                             const createOpts = {};
                             if (name) createOpts.name = name;
+                            if (isFederate) {
+                                createOpts.creation_content = {"m.federate": isFederate}
+                            }
                             createRoom({createOpts}).done();
                         }
                     }
diff --git a/src/components/views/dialogs/TextInputWithCheckboxDialog.js b/src/components/views/dialogs/TextInputWithCheckboxDialog.js
new file mode 100644
index 0000000000..916de16af5
--- /dev/null
+++ b/src/components/views/dialogs/TextInputWithCheckboxDialog.js
@@ -0,0 +1,108 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import sdk from '../../../index';
+
+export default React.createClass({
+    displayName: 'TextInputWithCheckboxDialog',
+    propTypes: {
+        title: React.PropTypes.string,
+        description: React.PropTypes.oneOfType([
+            React.PropTypes.element,
+            React.PropTypes.string,
+        ]),
+        value: React.PropTypes.string,
+        button: React.PropTypes.string,
+        focus: React.PropTypes.bool,
+        checkLabel: React.PropTypes.string,
+        check: React.PropTypes.bool,
+        onFinished: React.PropTypes.func.isRequired,
+    },
+
+    getDefaultProps: function() {
+        return {
+            title: "",
+            value: "",
+            description: "",
+            button: "OK",
+            focus: true,
+            checkLabel: "",
+            check: true,
+        };
+    },
+
+    getInitialState: function() {
+        return {
+            isChecked: this.props.check,
+        };
+    },
+
+    componentDidMount: function() {
+        if (this.props.focus) {
+            // Set the cursor at the end of the text input
+            this.refs.textinput.value = this.props.value;
+        }
+    },
+
+    onOk: function() {
+        this.props.onFinished(true, this.refs.textinput.value, this.state.isChecked);
+    },
+
+    onCancel: function() {
+        this.props.onFinished(false);
+    },
+
+    _onToggle: function(keyName, checkedValue, uncheckedValue, ev) {
+        console.log("Checkbox toggle: %s %s", keyName, ev.target.checked);
+        var state = {};
+        state[keyName] = ev.target.checked ? checkedValue : uncheckedValue;
+        this.setState(state);
+    },
+
+    render: function() {
+        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+        return (
+            <BaseDialog className="mx_TextInputWithCheckboxDialog" onFinished={this.props.onFinished}
+                onEnterPressed={this.onOk}
+                title={this.props.title}
+            >
+                <div className="mx_Dialog_content">
+                    <div className="mx_TextInputWithCheckboxDialog_label">
+                        <label htmlFor="textinput"> {this.props.description} </label>
+                    </div>
+                    <div>
+                        <input id="textinput" ref="textinput" className="mx_TextInputWithCheckboxDialog_input" defaultValue={this.props.value} autoFocus={this.props.focus} size="64" onKeyDown={this.onKeyDown}/>
+                    </div>
+                    <label>
+                        <input type="checkbox" id="checkbox" ref="checkbox"
+                               onChange={ this._onToggle.bind(this, "isChecked", true, false)}
+                               checked={this.state.isChecked}/>
+												{this.props.checkLabel}?
+                    </label>
+                </div>
+                <div className="mx_Dialog_buttons">
+                    <button onClick={this.onCancel}>
+                        Cancel
+                    </button>
+                    <button className="mx_Dialog_primary" onClick={this.onOk}>
+                        {this.props.button}
+                    </button>
+                </div>
+            </BaseDialog>
+        );
+    },
+});