diff --git a/grepolis.user.js b/grepolis.user.js
index f6b218d..0559610 100644
--- a/grepolis.user.js
+++ b/grepolis.user.js
@@ -10,7 +10,7 @@
 //
 // @match			http://*.grepolis.com/game/*
 //
-// @version         1.1.7
+// @version         1.1.8
 // @updateURL		http://git.javil.eu/jan/userscripts/raw/master/grepolis.user.js
 // ==/UserScript==
 
@@ -80,7 +80,7 @@
 		}
 		
 
-		$("#gpwnd_" + logGPWindow.getID()).parent().parent().find(".ui-dialog-titlebar").empty().append("<select id=choosefarmduration><option value=300>5min</option>option value=600>10min</option><option value=1200>20min</option><option value=2400>40min</option><option value=5400>90min</option><option value=10800>3h</option><option value=14400>4h</option><option value=28800>8h</option></select>" + GM_info.script.version);
+		$("#gpwnd_" + logGPWindow.getID()).parent().parent().find(".ui-dialog-titlebar").empty().append("<select id=choosefarmduration><option value=-1>disable</option><option value=300 selected>5min</option><option value=600>10min</option><option value=1200>20min</option><option value=2400>40min</option><option value=5400>90min</option><option value=10800>3h</option><option value=14400>4h</option><option value=28800>8h</option></select>" + GM_info.script.version);
 		var choose = $("#choosefarmduration")[0];
 		choose.onchange = function() {
 			farmDuration = this.value;
@@ -115,6 +115,8 @@
 
 				var windowId = windows[xFarmId];
 				if(windowId == undefined){
+					if(farmDuration < 300)
+						return;
 					var wnd = GPWindowMgr.Create(
 						GPWindowMgr.TYPE_FARM_TOWN, '', 
 						{'action': "claim_info"},