diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js
index c2dfcd9f3b..071efc9ef0 100644
--- a/apps/files_versions/js/versions.js
+++ b/apps/files_versions/js/versions.js
@@ -1,3 +1,13 @@
+$(document).ready(function() {
+        $('#versions').bind('change', function() {
+                var checked = 1;
+                if (!this.checked) {
+                        checked = 0;
+                }
+                $.post(OC.filePath('files_versions','ajax','togglesettings.php'), 'versions='+checked);
+        });
+});
+
 $(document).ready(function(){
 	
 	// Add history button to files/index.php
@@ -103,4 +113,4 @@ function createVersionsDropdown(filename, files) {
 	$('#dropdown').show('blind');
 	$('#share_with').chosen();
 	
-}
\ No newline at end of file
+}
diff --git a/apps/files_versions/templates/settings.php b/apps/files_versions/templates/settings.php
index 2f91825736..7488247316 100644
--- a/apps/files_versions/templates/settings.php
+++ b/apps/files_versions/templates/settings.php
@@ -1,7 +1,5 @@
-<form id="external">
-	<fieldset class="personalblock">
-		<strong>Versions</strong><br />
-
-		Configuration goes here...
-	</fieldset>
-</form>
\ No newline at end of file
+<form id="versions">
+        <fieldset class="personalblock">
+	        <input type="checkbox" name="versions" id="versions" value="1" <?php if (OC_Config::getValue('versions', 'true')=='true') echo ' checked="checked"'; ?> /> <label for="versions"><?php echo $l->t('Enable Files Versioning'); ?></label> <br/>
+        </fieldset>
+</form>