diff --git a/openid-connect-server/src/main/webapp/resources/js/client.js b/openid-connect-server/src/main/webapp/resources/js/client.js
index 3d207da5a..fe612722a 100644
--- a/openid-connect-server/src/main/webapp/resources/js/client.js
+++ b/openid-connect-server/src/main/webapp/resources/js/client.js
@@ -25,7 +25,7 @@ var ClientModel = Backbone.Model.extend({
         scope:[],
         authorities:[],
         clientDescription:"",
-        logoUrl:"",
+        logoUri:"",
         clientId:"",
         allowRefresh:false,
         accessTokenValiditySeconds: 3600,
@@ -212,7 +212,7 @@ var ClientFormView = Backbone.View.extend({
         "change #requireClientSecret":"toggleRequireClientSecret",
         "change #displayClientSecret":"toggleDisplayClientSecret",
         "change #generateClientSecret":"toggleGenerateClientSecret",
-        "change #logoUrl input":"previewLogo"
+        "change #logoUri input":"previewLogo"
     },
 
     toggleRefreshTokenTimeout:function () {
@@ -220,9 +220,9 @@ var ClientFormView = Backbone.View.extend({
     },
     
     previewLogo:function(event) {
-    	if ($('#logoUrl input', this.el).val()) {
+    	if ($('#logoUri input', this.el).val()) {
     		$('#logoPreview', this.el).empty();
-    		$('#logoPreview', this.el).attr('src', $('#logoUrl input').val());
+    		$('#logoPreview', this.el).attr('src', $('#logoUri input').val());
     	} else {
     		$('#logoBlock', this.el).hide();
     	}
@@ -355,7 +355,7 @@ var ClientFormView = Backbone.View.extend({
             generateClientSecret:generateClientSecret,
             redirectUris: this.redirectUrisCollection.pluck("item"),
             clientDescription:$('#clientDescription textarea').val(),
-            logoUrl:$('#logoUrl input').val(),
+            logoUri:$('#logoUri input').val(),
             authorizedGrantTypes: authorizedGrantTypes,
             accessTokenValiditySeconds: accessTokenValiditySeconds,
             refreshTokenValiditySeconds: refreshTokenValiditySeconds,
@@ -364,6 +364,7 @@ var ClientFormView = Backbone.View.extend({
             allowIntrospection: $('#allowIntrospection input').is(':checked'),
             scope: scopes,
             
+            
         });
 
         // post-validate
@@ -423,7 +424,7 @@ var ClientFormView = Backbone.View.extend({
         });
 
         $("#scope .controls",this.el).html(new ListWidgetView({placeholder: 'new scope here'
-            , autocomplete: _.uniq(_.flatten(app.systemScopeList.pluck("value"))) // TODO: load from default scopes
+            , autocomplete: _.uniq(_.flatten(app.systemScopeList.pluck("value")))
             , collection: this.scopeCollection}).render().el);
 
         if (!this.model.get("allowRefresh")) {
diff --git a/openid-connect-server/src/main/webapp/resources/template/client.html b/openid-connect-server/src/main/webapp/resources/template/client.html
index 674ce819e..c819ba1e6 100644
--- a/openid-connect-server/src/main/webapp/resources/template/client.html
+++ b/openid-connect-server/src/main/webapp/resources/template/client.html
@@ -112,10 +112,10 @@
                 </div>
             </div>
 
-			<div class="control-group" id="logoUrl">
+			<div class="control-group" id="logoUri">
 				<label class="control-label">Logo URL</label>
 				<div class="controls">
-					<input placeholder="http://" value="<%=logoUrl%>" maxlength="100" type="text" class=""/>
+					<input placeholder="http://" value="<%=logoUri%>" maxlength="100" type="text" class=""/>
 					<p class="help-block">URL to use for a logo image</p>
 				</div>
 			</div>
@@ -123,6 +123,7 @@
 			<div class="control-group" id="logoBlock">
 				<label class="control-label">Logo Preview</label>
 				<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" />
 				</div>
 			</div>