diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/create.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/create.hbs
index e69c9d4184..183e124bfa 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/create.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/create.hbs
@@ -16,7 +16,7 @@
   under the License.
 }}
 {{unit "cdmf.unit.ui.title" pageTitle="User Management | Add User"}}
-
+{{unit "cdmf.unit.ui.modal"}}
 {{#zone "breadcrumbs"}}
     <li>
         <a href="{{@app.context}}/">
@@ -122,26 +122,14 @@
                         <button id="add-user-btn" class="wr-btn">Add User</button>
                     </div>
                 </div>
-                <div id="user-created-msg" class="container col-centered wr-content hidden">
-                    <div class="wr-form">
-                        <p class="page-sub-title">User was added successfully.</p>
-                        <p>
-                            An invitation mail will be sent to this user to initiate device enrollment.
-                        </p>
 
-                        <br>Please click <b>"Add Another User"</b>, if you wish to add another user or click
-                        <b>"View User List"</b> to complete the process and go back to the user list.
-                        <hr/>
-                        <button class="wr-btn" onclick="window.location.href='{{@app.context}}/users'">View User List
-                        </button>
-                        <a href="{{@app.context}}/user/add" class="cu-btn-inner">
-                        <span class="fw-stack">
-                            <i class="fw fw-circle-outline fw-stack-2x"></i>
-                            <i class="fw fw-add fw-stack-1x"></i>
-                        </span>
-                            Add Another User
-                        </a>
+                <div id="modal-content-user-created" class="hide">
+                    <div id="notification-error-msg" class="alert alert-danger hidden" role="alert">
+                        <i class="icon fw fw-error"></i><span></span>
                     </div>
+                    <h4>
+                        An invitation mail will be sent to this user to initiate device enrollment.
+                    </h4>
                 </div>
                 <!-- /content -->
             </div>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/public/js/bottomJs.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/public/js/bottomJs.js
index 317cf435e4..d67af04085 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/public/js/bottomJs.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/public/js/bottomJs.js
@@ -282,7 +282,13 @@ $(document).ready(function () {
                         }
                         // Refreshing with success message
                         $("#user-create-form").addClass("hidden");
-                        $("#user-created-msg").removeClass("hidden");
+                        modalDialog.header('<span class="fw-stack">' +
+                            '<i class="fw fw-info fw-stack-1x"></i> </span> User was added successfully');
+                        modalDialog.content($("#modal-content-user-created").html());
+                        modalDialog.footer('<div class="buttons"> ' +
+                            '<a href="/devicemgt/users" id="reset-password-yes-link" class="btn-operations"> OK' +
+                            ' </a></div>');
+                        modalDialog.show();
                         generateQRCode("#user-created-msg .qr-code");
 
                     }