diff --git a/Iceberg.package/IceCommitModelNew.class/class/settingsOn..st b/Iceberg.package/IceCommitModelNew.class/class/settingsOn..st
new file mode 100644
index 0000000000..c444d8a99c
--- /dev/null
+++ b/Iceberg.package/IceCommitModelNew.class/class/settingsOn..st
@@ -0,0 +1,8 @@
+settings
+settingsOn: aBuilder 
+	<systemsettings>
+	(aBuilder setting: #'uploadChangesOnCommit')
+		parent: #Iceberg;
+		target: self;
+		label: 'Upload changes on commit';
+		description: 'If selected your code will be uploaded by default on each commit (if possible)'
diff --git a/Iceberg.package/IceCommitModelNew.class/class/uploadChangesOnCommit..st b/Iceberg.package/IceCommitModelNew.class/class/uploadChangesOnCommit..st
new file mode 100644
index 0000000000..0a577cf379
--- /dev/null
+++ b/Iceberg.package/IceCommitModelNew.class/class/uploadChangesOnCommit..st
@@ -0,0 +1,3 @@
+accessing
+uploadChangesOnCommit: anObject
+	UploadChangesOnCommit := anObject
\ No newline at end of file
diff --git a/Iceberg.package/IceCommitModelNew.class/class/uploadChangesOnCommit.st b/Iceberg.package/IceCommitModelNew.class/class/uploadChangesOnCommit.st
new file mode 100644
index 0000000000..439e3c8437
--- /dev/null
+++ b/Iceberg.package/IceCommitModelNew.class/class/uploadChangesOnCommit.st
@@ -0,0 +1,3 @@
+accessing
+uploadChangesOnCommit
+	^ UploadChangesOnCommit ifNil: [ UploadChangesOnCommit := true ]
\ No newline at end of file
diff --git a/Iceberg.package/IceCommitModelNew.class/instance/initializeWidgets.st b/Iceberg.package/IceCommitModelNew.class/instance/initializeWidgets.st
index 2404780adc..b9bb92fd66 100644
--- a/Iceberg.package/IceCommitModelNew.class/instance/initializeWidgets.st
+++ b/Iceberg.package/IceCommitModelNew.class/instance/initializeWidgets.st
@@ -7,6 +7,7 @@ initializeWidgets
 		
 	pushCheckbox := self newCheckBox
 		label: 'Upload changes on commit?';
+		state: self class uploadChangesOnCommit;
 		yourself.
 	
 	self focusOrder 
diff --git a/Iceberg.package/IceCommitModelNew.class/properties.json b/Iceberg.package/IceCommitModelNew.class/properties.json
index 1c461722a9..5a0b4cff52 100644
--- a/Iceberg.package/IceCommitModelNew.class/properties.json
+++ b/Iceberg.package/IceCommitModelNew.class/properties.json
@@ -4,7 +4,7 @@
 		 ],
 	"classtraitcomposition" : "TIceTool classTrait",
 	"classvars" : [
-		 ],
+		"UploadChangesOnCommit" ],
 	"commentStamp" : "NicoPasserini 8/25/2016 14:47",
 	"instvars" : [
 		"message",