diff --git a/zeppelin-web/src/app/credential/credential.controller.js b/zeppelin-web/src/app/credential/credential.controller.js
index 11dff3e1aa3..32562b84133 100644
--- a/zeppelin-web/src/app/credential/credential.controller.js
+++ b/zeppelin-web/src/app/credential/credential.controller.js
@@ -21,15 +21,27 @@ angular.module('zeppelinWebApp').controller('CredentialCtrl', function($scope, $
   $scope.credentialEntity = '';
   $scope.credentialUsername = '';
   $scope.credentialPassword = '';
-  
+
   $scope.updateCredentials = function() {
+    if (_.isEmpty($scope.credentialEntity.trim()) ||
+        _.isEmpty($scope.credentialUsername.trim())) {
+      BootstrapDialog.alert({
+        closable: true,
+        message: 'Username \\ Entity can not be empty.'
+      });
+      return;
+    }
+
     $http.put(baseUrlSrv.getRestApiBase() + '/credential',
       { 'entity': $scope.credentialEntity,
         'username': $scope.credentialUsername,
         'password': $scope.credentialPassword
       } ).
     success(function (data, status, headers, config) {
-      alert('Successfully saved credentials');
+      BootstrapDialog.alert({
+        closable: true,
+        message: 'Successfully saved credentials.'
+      });
       $scope.credentialEntity = '';
       $scope.credentialUsername = '';
       $scope.credentialPassword = '';