diff --git a/js/settings/UpdatePanel.js b/js/settings/UpdatePanel.js
index 6594d0b..6d24a6e 100644
--- a/js/settings/UpdatePanel.js
+++ b/js/settings/UpdatePanel.js
@@ -7,6 +7,8 @@
  */
 
 function UpdatePanel() {
+	var _form = new FormPanel();
+
 	this.wifiboxURL;
 	this.element;
 	
@@ -40,24 +42,34 @@ function UpdatePanel() {
 	var self = this;
 
 	this.init = function(wifiboxURL,updatePanelElement) {
+		_form.init(wifiboxURL,wifiboxURL,updatePanelElement);
 		
 		this.wifiboxURL = wifiboxURL;
 		
 		this.element = updatePanelElement;
 		this.retainCheckbox = this.element.find("#retainConfiguration");
+		this.includeBetasCheckbox = this.element.find("#includeBetas");
 		this.btnUpdate = this.element.find("#update");
 		this.statusDisplay = this.element.find("#updateState");
 		this.infoDisplay = this.element.find("#updateInfo");
 		
 		this.retainCheckbox.change(this.retainChanged);
+		this.includeBetasCheckbox.change(this.includeBetasChanged);
 		this.btnUpdate.click(this.update);
 		
 		this.checkStatus(false);
 	}
 	this.retainChanged = function(e) {
 		//console.log("UpdatePanel:retainChanged");
+		//this call ensures that the update button gets enabled if (!retainChanged && !canUpdate)
 		self.setState(self.state,true);
 	}
+	this.includeBetasChanged = function() {
+		//console.log("UpdatePanel:includeBetasChanged");
+		_form.saveSettings(_form.readForm(),function(validated, data) {
+			if(validated) self.checkStatus(false);
+		});
+	}
 	this.update = function() {
 		console.log("UpdatePanel:update");
 		self.downloadUpdate();
@@ -149,6 +161,8 @@ function UpdatePanel() {
 	
 	this.handleStatusData = function(data) {
 		//console.log("UpdatePanel:handleStatusData");
+		var refreshUI = (self.canUpdate != data.can_update);
+
 		self.canUpdate 				= data.can_update;
 		
 		if(self.currentVersion != data.current_version || self.newestVersion != data.newest_version) {
@@ -161,7 +175,7 @@ function UpdatePanel() {
 		self.progress 				= data.progress; // not always available
 		self.imageSize 				= data.image_size; // not always available
 		
-		self.setState(data.state_code);
+		self.setState(data.state_code, refreshUI);
 		
 		switch(this.state){
 			case UpdatePanel.IMAGE_READY:
diff --git a/www/css/settings.css b/www/css/settings.css
index dc6a6cf..25b1360 100644
--- a/www/css/settings.css
+++ b/www/css/settings.css
@@ -137,7 +137,7 @@ form dl dt {
 	font-style: italic;
 	width: 10em;
 }
-#updatePanel #retainConfigurationLabel {
+#updatePanel #retainConfigurationLabel, #updatePanel #includeBetasLabel {
 	display: inline;
 	float: none;
 }
\ No newline at end of file
diff --git a/www/settings.html b/www/settings.html
index 943d441..147601e 100644
--- a/www/settings.html
+++ b/www/settings.html
@@ -52,7 +52,7 @@
         <option value="marlin_generic">Generic Marlin Printer</option>
         <option value="makerbot_generic">Generic Makerbot Printer</option>
       </select> --><br/>
-      
+
       <label for="printerDimensionsX">Dimensions:</label>
       x:<input id="printerDimensionsX" type="number" class="small" name="printer.dimensions.x" placeholder="x">mm<br>
       <label for="printerDimensionsY"></label>
@@ -80,7 +80,7 @@
       				<dt>{preheatBedTemp}</dt><dd>Preheat bed temperature</dd>
       				<dt>{printerType}</dt><dd>Printer type</dd>
       				<dt>{if heatedBed}</dt><dd>Enable line if printer has heated bed</dd>
-      				
+
       			</dl>
       		</small>
       	</div>
@@ -165,8 +165,9 @@
 
 	<fieldset id="updatePanel">
  		<legend>Update</legend>
- 		<input id="retainConfiguration" type="checkbox" name="" value="retainConfiguration" checked="true"> <label for="retainConfiguration" id="retainConfigurationLabel">Preserve personal sketches and settings</label>
- 		<br/><br/>
+ 		<input id="retainConfiguration" type="checkbox" name="" value="retainConfiguration" checked="true"> <label for="retainConfiguration" id="retainConfigurationLabel">Preserve personal sketches and settings</label><br/>
+ 		<input id="includeBetas" type="checkbox" name="doodle3d.includeBetas" value="includeBetas"> <label for="includeBetas" id="includeBetasLabel">Include beta releases (<a target="beta-info" href="http://doodle3d.com/help/beta">read more</a>)</label><br/>
+ 		<br/>
  		<input type="button" name="update" value="Update" class="button" id="update"/>
         <span id="updateState"></span><br/>
         <small id="updateInfo"></small>
@@ -178,7 +179,7 @@
     <input type="button" onclick="settingsWindow.downloadGcode()" name="downloadGcode" value="Download GCODE" class="button" id="downloadGcode"/>
     <input type="button" onclick="settingsWindow.downloadSvg()" name="downloadSvg" value="Download SVG" class="button" id="downloadSvg"/>
     </fieldset>
-    
+
     <fieldset id="restorePanel">
  		<legend>Restore</legend>
  		<input type="button" name="restoresettings" value="Restore settings to defaults" class="button" id="restoreSettings"/>