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 183e124bfa..cd4c67a575 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
@@ -128,7 +128,7 @@
                         <i class="icon fw fw-error"></i><span></span>
                     </div>
                     <h4>
-                        An invitation mail will be sent to this user to initiate device enrollment.
+                        User added successfully.
                     </h4>
                 </div>
                 <!-- /content -->
diff --git a/components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/service/EmailSenderServiceImpl.java b/components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/service/EmailSenderServiceImpl.java
index 8e129a7ed1..daaf8f6102 100644
--- a/components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/service/EmailSenderServiceImpl.java
+++ b/components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/service/EmailSenderServiceImpl.java
@@ -70,7 +70,7 @@ public class EmailSenderServiceImpl implements EmailSenderService {
                 emailData = contentProvider.getContent(info.getTemplate(), info.getParams());
                 if(EmailSenderDataHolder.getInstance().getConfigurationContextService()
                         .getServerConfigContext().getAxisConfiguration().getTransportOut(transportSenderName) == null){
-                    throw new EmailSendingFailedException("Email transport is not configured.");
+                    log.warn("Email invitation is not sent as the email is not configured.");
                 }
             } catch (ContentProcessingInterruptedException e) {
                 throw new EmailSendingFailedException("Error occurred while retrieving email content to be " +