diff --git a/etemplate/js/et2_core_legacyJSFunctions.js b/etemplate/js/et2_core_legacyJSFunctions.js
index 068a821f4d..039b062aef 100644
--- a/etemplate/js/et2_core_legacyJSFunctions.js
+++ b/etemplate/js/et2_core_legacyJSFunctions.js
@@ -48,7 +48,7 @@
 			var _cname = widget.getPath() ? widget.getPath().join("[") : false;
 			_val = _val.replace(/form::name\(/g, "'"+widget.getRoot()._inst.uniqueId+"_'+"+(_cname ? "et2_form_name('"+_cname+"'," : '('));
 		}
-	
+
 		if (_val.indexOf('egw::lang(') != -1)
 		{
 			_val = _val.replace(/egw::lang\(/g,'egw.lang(');
@@ -96,7 +96,7 @@
 		// Check whether _code is simply "1" -- if yes replace it accordingly
 		if (_code === '1')
 		{
-			_code = 'widget.getInstanceManager().submit(); return true;';
+			_code = 'widget.getInstanceManager().submit(); return false;';
 		}
 
 		// Check whether some pseudo-variables still reside inside of the code,
diff --git a/etemplate/js/et2_widget_image.js b/etemplate/js/et2_widget_image.js
index 91afb8b461..1264db1f2a 100644
--- a/etemplate/js/et2_widget_image.js
+++ b/etemplate/js/et2_widget_image.js
@@ -20,10 +20,10 @@
 
 /**
  * Class which implements the "image" XET-Tag
- * 
+ *
  * @augments et2_baseWidget
- */ 
-var et2_image = et2_baseWidget.extend([et2_IDetachedDOM], 
+ */
+var et2_image = et2_baseWidget.extend([et2_IDetachedDOM],
 {
 	attributes: {
 		"src": {
@@ -62,7 +62,7 @@ var et2_image = et2_baseWidget.extend([et2_IDetachedDOM],
 
 	/**
 	 * Constructor
-	 * 
+	 *
 	 * @memberOf et2_image
 	 */
 	init: function() {
@@ -74,7 +74,7 @@ var et2_image = et2_baseWidget.extend([et2_IDetachedDOM],
 		{
 			this.image.attr("alt", this.options.label).attr("title", this.options.label);
 		}
-		if (this.options.href) 
+		if (this.options.href)
 		{
 			this.image.addClass('et2_clickable');
 		}
@@ -84,7 +84,7 @@ var et2_image = et2_baseWidget.extend([et2_IDetachedDOM],
 		}
 		this.setDOMNode(this.image[0]);
 	},
-	
+
 	click: function()
 	{
 		if(this.options.href)
@@ -106,7 +106,7 @@ var et2_image = et2_baseWidget.extend([et2_IDetachedDOM],
 			var manager = this.getArrayMgr("content");
 			if(manager) {
 				var src = manager.getEntry(_attrs["src"]);
-				if (typeof src != "undefined")
+				if (typeof src != "undefined" && src !== null)
 				{
 					if(typeof src == "object")
 					{