diff --git a/openid-connect-server-webapp/src/main/webapp/resources/images/logo_placeholder.gif b/openid-connect-server-webapp/src/main/webapp/resources/images/logo_placeholder.gif
new file mode 100644
index 000000000..035747694
Binary files /dev/null and b/openid-connect-server-webapp/src/main/webapp/resources/images/logo_placeholder.gif differ
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/client.js b/openid-connect-server-webapp/src/main/webapp/resources/js/client.js
index 829ecf4b4..448cbe51d 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/js/client.js
+++ b/openid-connect-server-webapp/src/main/webapp/resources/js/client.js
@@ -525,7 +525,8 @@ var ClientFormView = Backbone.View.extend({
     		$('#logoPreview', this.el).empty();
     		$('#logoPreview', this.el).attr('src', $('#logoUri input').val());
     	} else {
-    		$('#logoBlock', this.el).hide();
+    		//$('#logoBlock', this.el).hide();
+    		$('#logoPreview', this.el).attr('src', 'resources/images/logo_placeholder.gif');
     	}
     },
 
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/dynreg.js b/openid-connect-server-webapp/src/main/webapp/resources/js/dynreg.js
index 548470556..61b974a7d 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/js/dynreg.js
+++ b/openid-connect-server-webapp/src/main/webapp/resources/js/dynreg.js
@@ -214,7 +214,8 @@ var DynRegEditView = Backbone.View.extend({
     		$('#logoPreview', this.el).empty();
     		$('#logoPreview', this.el).attr('src', $('#logoUri input').val());
     	} else {
-    		$('#logoBlock', this.el).hide();
+    		//$('#logoBlock', this.el).hide();
+    		$('#logoPreview', this.el).attr('src', 'resources/images/logo_placeholder.gif');
     	}
     },
 
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/rsreg.js b/openid-connect-server-webapp/src/main/webapp/resources/js/rsreg.js
index 2e01fa15b..e830c60fe 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/js/rsreg.js
+++ b/openid-connect-server-webapp/src/main/webapp/resources/js/rsreg.js
@@ -214,7 +214,8 @@ var ResRegEditView = Backbone.View.extend({
     		$('#logoPreview', this.el).empty();
     		$('#logoPreview', this.el).attr('src', $('#logoUri input').val());
     	} else {
-    		$('#logoBlock', this.el).hide();
+    		//$('#logoBlock', this.el).hide();
+    		$('#logoPreview', this.el).attr('src', 'resources/images/logo_placeholder.gif');
     	}
     },
 
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/template/client.html b/openid-connect-server-webapp/src/main/webapp/resources/template/client.html
index c66190068..f52215121 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/template/client.html
+++ b/openid-connect-server-webapp/src/main/webapp/resources/template/client.html
@@ -202,8 +202,7 @@
 
 			<div class="control-group" id="logoBlock">
 				<div class="controls">
-					<!-- TODO: this should be an internally-served placeholder graphic -->
-					<img src="http://placehold.it/275x200&text=Enter a logo URL" alt="logo" id="logoPreview" width="275px" class="thumbnail" />
+					<img src="resources/images/logo_placeholder.gif" alt="logo" id="logoPreview" width="275px" class="thumbnail" />
 				</div>
 			</div>
 
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/template/dynreg.html b/openid-connect-server-webapp/src/main/webapp/resources/template/dynreg.html
index 6d7ce3cbe..9aebe3267 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/template/dynreg.html
+++ b/openid-connect-server-webapp/src/main/webapp/resources/template/dynreg.html
@@ -168,8 +168,7 @@
 
 			<div class="control-group" id="logoBlock">
 				<div class="controls">
-					<!-- TODO: this should be an internally-served placeholder graphic -->
-					<img src="http://placehold.it/275x200&text=Enter a logo URL" alt="logo" id="logoPreview" width="275px" class="thumbnail" />
+					<img src="resources/images/logo_placeholder.gif" alt="logo" id="logoPreview" width="275px" class="thumbnail" />
 				</div>
 			</div>
 
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/template/rsreg.html b/openid-connect-server-webapp/src/main/webapp/resources/template/rsreg.html
index 5c3d0239b..58c55c1ec 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/template/rsreg.html
+++ b/openid-connect-server-webapp/src/main/webapp/resources/template/rsreg.html
@@ -160,8 +160,7 @@
 
 			<div class="control-group" id="logoBlock">
 				<div class="controls">
-					<!-- TODO: this should be an internally-served placeholder graphic -->
-					<img src="http://placehold.it/275x200&text=Enter a logo URL" alt="logo" id="logoPreview" width="275px" class="thumbnail" />
+					<img src="resources/images/logo_placeholder.gif" alt="logo" id="logoPreview" width="275px" class="thumbnail" />
 				</div>
 			</div>