diff --git a/openid-connect-server/src/main/webapp/resources/js/app.js b/openid-connect-server/src/main/webapp/resources/js/app.js
index 2dd69a647..8ccee8a8f 100644
--- a/openid-connect-server/src/main/webapp/resources/js/app.js
+++ b/openid-connect-server/src/main/webapp/resources/js/app.js
@@ -503,6 +503,7 @@
                 , autocomplete: _.uniq(_.flatten(app.clientList.pluck("scope")))
                 , collection: this.scopeCollection}).render().el);
 
+            // set up refresh 
             if (!this.model.get("allowRefresh")) {
                 $("#refreshTokenValiditySeconds", this.$el).hide();
             }
@@ -519,14 +520,15 @@
                 $("#id-token-timeout-seconds", this.$el).prop('disabled',true);
             }
 
+            // setup client secret display
+            this.toggleRequireClientSecret();
+            
+            // setup logo display
+            this.previewLogo();
 
             return this;
-        },
-        
-        postRender:function() {
-            this.toggleRequireClientSecret();
-            this.previewLogo();
         }
+        
     });
 
 
@@ -601,7 +603,6 @@
         	
             this.clientFormView = new ClientFormView({model:client});
             $('#content').html(this.clientFormView.render().el);
-            this.clientFormView.postRender(); // set up the form for the given model data
         },
 
         editClient:function(id) {
@@ -628,7 +629,6 @@
             
             this.clientFormView = new ClientFormView({model:client});
             $('#content').html(this.clientFormView.render().el);
-            this.clientFormView.postRender(); // set up the form for the given model data
         },
 
         whiteList:function () {