diff --git a/Swift.DAL/OnlineAgent/OnlineCustomerDao.cs b/Swift.DAL/OnlineAgent/OnlineCustomerDao.cs
index 7749c13..2e1ef4c 100644
--- a/Swift.DAL/OnlineAgent/OnlineCustomerDao.cs
+++ b/Swift.DAL/OnlineAgent/OnlineCustomerDao.cs
@@ -69,7 +69,7 @@ namespace Swift.DAL.OnlineAgent
             return ExecuteDataset(sql);
         }
 
-        public DbResult ActivateMobileLogin(string user, string custId, string password, string referral = null, string membershipId = "")
+        public DbResult ActivateMobileLogin(string user, string custId, string password, string membershipId = "", string referral = null )
         {
             var sql = "EXEC proc_online_approve_Customer";
             sql += " @Flag ='create-mobile-login'";
diff --git a/Swift.web/MobileRemit/Admin/PushNotification/ManageBroadCast.aspx.cs b/Swift.web/MobileRemit/Admin/PushNotification/ManageBroadCast.aspx.cs
index ae9f450..64148c9 100644
--- a/Swift.web/MobileRemit/Admin/PushNotification/ManageBroadCast.aspx.cs
+++ b/Swift.web/MobileRemit/Admin/PushNotification/ManageBroadCast.aspx.cs
@@ -82,7 +82,7 @@ namespace Swift.web.MobileRemit.Admin.PushNotification
             var nativeCountry = ddlNativeCountry.SelectedValue;
 
 
-            if (string.IsNullOrEmpty(customerId) && customerType != "nativeCountry")
+            if (string.IsNullOrEmpty(customerId) && customerType != "nativeCountry" && customerType.ToLower() != "all")
             {
                 GetStatic.AlertMessage(this, "Customer can not be empty!");
                 return null;
diff --git a/Swift.web/MobileRemit/Admin/Reports/CustomerRegistrationStatus.aspx b/Swift.web/MobileRemit/Admin/Reports/CustomerRegistrationStatus.aspx
index 8550f26..51d2ff9 100644
--- a/Swift.web/MobileRemit/Admin/Reports/CustomerRegistrationStatus.aspx
+++ b/Swift.web/MobileRemit/Admin/Reports/CustomerRegistrationStatus.aspx
@@ -149,7 +149,7 @@
                                         <div class="panel-heading">Registration Type :</div>
                                         <div class="panel-body scroll-main">
                                             <div class="row">
-                                                <div class="col-md-2 col-sm-4 hideForOrganisation">
+                                                <div class="col-md-2 col-sm-4 hideForOrganisation" style="display:none;">
                                                     <div class="form-group">
                                                         <%--  <label>KYC Type:<span class="errormsg">*</span></label>--%>
                                                         <asp:RadioButtonList ID="rbKycType" runat="server" CssClass="clearOnOrganisation"
@@ -160,8 +160,9 @@
                                                     </div>
                                                 </div>
                                                 <div class="form-group">
-                                                    <asp:Button ID="btnUpdate" runat="server" CssClass="btn btn-primary m-t-25" Text="Update" OnClick="update_Click" />
+<%--                                                    <asp:Button ID="btnUpdate" runat="server" CssClass="btn btn-primary m-t-25" Text="Update" OnClick="update_Click" />--%>
                                                     <asp:Button ID="btnReset" runat="server" CssClass="btn btn-primary m-t-25" Text="Reset KYC" OnClick="reset_Click" />
+                                                    <asp:Button ID="btnActivate" runat="server" CssClass="btn btn-primary m-t-25" Text="Activate" OnClick="activate_Click" />
                                                 </div>
                                             </div>
                                         </div>
@@ -169,7 +170,7 @@
                                 </div>
                             </div>
 
-                            <div class="row info" runat="server" id="moreData">
+                            <div class="row info" runat="server" id="moreData" style="display:none;">
                                 <div class="col-sm-12">
                                     <div class="panel panel-default">
                                         <div class="panel-heading">Customer Details</div>
@@ -197,7 +198,7 @@
                                 </div>
                             </div>
 
-                            <div class="row info" runat="server" id="kycData">
+                            <div class="row info" runat="server" id="kycData" style="display: none;">
                                 <div class="col-sm-12">
                                     <div class="panel panel-default">
                                         <div class="panel-heading"><b>EKyc Details </b></div>
diff --git a/Swift.web/MobileRemit/Admin/Reports/CustomerRegistrationStatus.aspx.cs b/Swift.web/MobileRemit/Admin/Reports/CustomerRegistrationStatus.aspx.cs
index 1489722..5c845fd 100644
--- a/Swift.web/MobileRemit/Admin/Reports/CustomerRegistrationStatus.aspx.cs
+++ b/Swift.web/MobileRemit/Admin/Reports/CustomerRegistrationStatus.aspx.cs
@@ -1,6 +1,11 @@
-using Swift.DAL.OnlineAgent;
+using Newtonsoft.Json;
+using Swift.API.Common;
+using Swift.API.Common.Enum;
+using Swift.API.TPAPIs;
+using Swift.DAL.OnlineAgent;
 using Swift.web.Library;
 using System;
+using System.Collections.Generic;
 using System.Data;
 using System.Text;
 
@@ -16,8 +21,9 @@ namespace Swift.web.MobileRemit.Admin.Reports
         protected void Page_Load(object sender, EventArgs e)
         {
             Authenticate();
-            btnUpdate.Enabled = true;
+            //btnUpdate.Enabled = true;
             btnReset.Enabled = true;
+            btnActivate.Enabled = false;
 
             if (!IsPostBack)
             {
@@ -99,9 +105,20 @@ namespace Swift.web.MobileRemit.Admin.Reports
             cusData.Visible = true;
             registrationTypeDiv.Visible = true;
 
+            if ((customerDetails.Rows[0]["createdFrom"].ToString() == "C") || (customerDetails.Rows[0]["createdFrom"].ToString() == "O"))
+            {
+                if(customerDetails.Rows[0]["mobileApprovedDate"].ToString() == "")
+                {
+                    btnActivate.Enabled = true;
+                }
+            }
+            else
+            {
+                btnActivate.Enabled = false;
+            }
             if (customerDetails.Rows[0]["approvedBy"].ToString() != "")
             {
-                btnUpdate.Enabled = false;
+                //btnUpdate.Enabled = false;
                 btnReset.Enabled = false;
             }
             else if (customerDetails.Rows[0]["customerSource"].ToString() == "temp")
@@ -110,7 +127,7 @@ namespace Swift.web.MobileRemit.Admin.Reports
             }
             else
             {
-                btnUpdate.Enabled = true;
+                //btnUpdate.Enabled = true;
                 btnReset.Enabled = true;
             }
         }
@@ -168,16 +185,16 @@ namespace Swift.web.MobileRemit.Admin.Reports
             tblKycDetail.InnerHtml = str.ToString();
         }
 
-        protected void update_Click(object sender, EventArgs e)
-        {
-            string customerId = txtSearchData.Value.Split('|')[0];
-            string customerSource = txtSearchData.Value.Split('|')[1];
-            string kycType = rbKycType.SelectedValue;
+        //protected void update_Click(object sender, EventArgs e)
+        //{
+        //    string customerId = txtSearchData.Value.Split('|')[0];
+        //    string customerSource = txtSearchData.Value.Split('|')[1];
+        //    string kycType = rbKycType.SelectedValue;
 
-            var dbResult = _cd.UpdateKycType(customerId, kycType, customerSource, GetStatic.GetUser());
-            GetStatic.AlertMessage(this.Page, dbResult.Msg);
+        //    var dbResult = _cd.UpdateKycType(customerId, kycType, customerSource, GetStatic.GetUser());
+        //    GetStatic.AlertMessage(this.Page, dbResult.Msg);
 
-        }
+        //}
         protected void reset_Click(object sender, EventArgs e)
         {
             string customerId = txtSearchData.Value.Split('|')[0];
@@ -193,5 +210,60 @@ namespace Swift.web.MobileRemit.Admin.Reports
                 GetStatic.AlertMessage(this.Page, "Customer KYC has been successfully cleared.");
             }
         }
+        protected void activate_Click(object sender, EventArgs e)
+        {
+            string customerId = txtSearchData.Value.Split('|')[0];
+            var custompass = PasswordGenerator.GenerateRandomPassword();
+            var membershipId = Request.Form["membershipId"];
+            var dbRes = _cd.ActivateMobileLogin(GetStatic.GetUser(), customerId, custompass, membershipId);
+            
+            if (dbRes.ErrorCode == "0")
+            {
+                DataRow result = _cd.GetDetailsWithPinNo(customerId, GetStatic.GetUser());
+                //CustomerDetails cd = _cd.GetUserDetails(selecteduserId);
+                var email = result["userName"].ToString();
+                List<Mapping> bodyMappings = new List<Mapping>();
+
+                bodyMappings.Add(new Mapping() { SValue = "CustomerName", SText = result["FullName"].ToString() });
+                bodyMappings.Add(new Mapping() { SValue = "CustomerId", SText = customerId });
+                bodyMappings.Add(new Mapping() { SValue = "Address", SText = result["Address1"].ToString() });
+                bodyMappings.Add(new Mapping() { SValue = "EMAIL_ID", SText = email });
+                bodyMappings.Add(new Mapping() { SValue = "PASS_WORD", SText = result["Password"].ToString() });
+                bodyMappings.Add(new Mapping() { SValue = "PIN_NO", SText = result["PinNo"].ToString() });
+
+
+                SendNotificationRequestMobile request = new SendNotificationRequestMobile()
+                {
+                    IsBulkNotification = false,
+                    UserName = email,
+                    ProcessId = Guid.NewGuid().ToString(),
+                    ProviderId = NotifyTemplate.PIN_PASSWORD_EMAIL.ToString(),
+                    NotificationTypeId = NOTIFICATION_TYPE.EMAIL.ToString(),
+                    Template = NotifyTemplate.PIN_PASSWORD_EMAIL,
+                    Recipients = new List<RecipientViewModel>()
+                {
+                    new RecipientViewModel()
+                    {
+                        NotificationContent =  new NotificationDTO() {
+                         Body = JsonConvert.SerializeObject(bodyMappings),
+                            //Title will be set by mapping json
+                        },
+                         Address= email
+                    }
+                }
+                };
+
+                var res = NotifierV2.SendNotification(request, NOTIFICATION_TYPE.EMAIL);
+
+                txtSearchData.Text = "";
+                cusData.Visible = false;
+                registrationTypeDiv.Visible = false;
+                GetStatic.AlertMessage(this, dbRes.Msg);
+            }
+            else
+            {
+                GetStatic.AlertMessage(this, dbRes.Msg);
+            }
+        }                        
     }
 }
\ No newline at end of file
diff --git a/Swift.web/MobileRemit/Admin/Reports/CustomerRegistrationStatus.aspx.designer.cs b/Swift.web/MobileRemit/Admin/Reports/CustomerRegistrationStatus.aspx.designer.cs
index 4c4eac6..43edc8c 100644
--- a/Swift.web/MobileRemit/Admin/Reports/CustomerRegistrationStatus.aspx.designer.cs
+++ b/Swift.web/MobileRemit/Admin/Reports/CustomerRegistrationStatus.aspx.designer.cs
@@ -123,22 +123,22 @@ namespace Swift.web.MobileRemit.Admin.Reports
         protected global::System.Web.UI.WebControls.RadioButtonList rbKycType;
 
         /// <summary>
-        /// btnUpdate control.
+        /// btnReset control.
         /// </summary>
         /// <remarks>
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Button btnUpdate;
+        protected global::System.Web.UI.WebControls.Button btnReset;
 
         /// <summary>
-        /// btnReset control.
+        /// btnActivate control.
         /// </summary>
         /// <remarks>
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Button btnReset;
+        protected global::System.Web.UI.WebControls.Button btnActivate;
 
         /// <summary>
         /// moreData control.
diff --git a/Swift.web/Remit/Transaction/Modify/ModifyField.aspx.cs b/Swift.web/Remit/Transaction/Modify/ModifyField.aspx.cs
index cecb4c1..6e00206 100644
--- a/Swift.web/Remit/Transaction/Modify/ModifyField.aspx.cs
+++ b/Swift.web/Remit/Transaction/Modify/ModifyField.aspx.cs
@@ -43,6 +43,15 @@ namespace Swift.web.Remit.Transaction.Modify
                     rptName.Visible = true;
                     rptShowOther.Visible = false;
                 }
+                else if (getFieldName() == "paymentMethod")
+                {
+                    rptShowOther.Visible = true;
+                    PopulateDll(getFieldName());
+                    ddlNewValue.Visible = true;
+                    txtNewValue.Visible = false;
+                    rptName.Visible = false;
+                    txtContactNo.Visible = false;
+                }
                 else
                 {
                     rptShowOther.Visible = true;
@@ -75,6 +84,8 @@ namespace Swift.web.Remit.Transaction.Modify
                 lblFieldName.Text = "Receiver Id No";
             else if (getFieldName() == "sIdNo")
                 lblFieldName.Text = "Sender Id No";
+            else if (getFieldName() == "paymentMethod")
+                lblFieldName.Text = "Mode of Payment";
 
         }
         private string GetLabel()
@@ -95,10 +106,13 @@ namespace Swift.web.Remit.Transaction.Modify
         }
         private void PopulateDll(string fieldName)
         {
+            var country = GetStatic.ReadQueryString("pCountry","");
             if (fieldName == "rIdType")
                 sd.SetDDL(ref ddlNewValue, "EXEC proc_online_dropDownList @flag = 'idType', @user = '" + GetStatic.GetUser() + "'", "valueId", "detailTitle", "", "Select..");
             else if (fieldName == "sIdType")
                 sd.SetDDL2(ref ddlNewValue, "EXEC proc_countryIdType @flag = 'il', @countryId='151', @spFlag = '5201'", "detailTitle", "", "Select");
+            else if (fieldName == "paymentMethod")
+                sd.SetDDL(ref ddlNewValue, "EXEC proc_online_sendPageLoadData @flag = 'payoutMethods' ,@country = " + country + "", "Key", "Value", "", "Select");
         }
         protected void btnUpdate_Click(object sender, EventArgs e)
         {
diff --git a/Swift.web/Remit/Transaction/Modify/ModifyLocation.aspx b/Swift.web/Remit/Transaction/Modify/ModifyLocation.aspx
index e157c88..7a72d70 100644
--- a/Swift.web/Remit/Transaction/Modify/ModifyLocation.aspx
+++ b/Swift.web/Remit/Transaction/Modify/ModifyLocation.aspx
@@ -107,6 +107,15 @@
                             </td>
                         </tr>
                         </div>
+                        <tr id="modeOfPayment" runat="server"  visible="false">
+                            <td  nowrap="nowrap">
+                                <div align="right"> Mode of Payment : </div>
+                            </td>
+                            <td  nowrap="nowrap">
+                                <asp:DropDownList ID="ddlPaymnetMode" runat="server" CssClass="input"></asp:DropDownList>
+                            </td>
+                        </tr>
+                        </div>
                         <div id="rptAccountNo" runat="server" visible="false">
                         <tr>
                             <td  nowrap="nowrap">
diff --git a/Swift.web/Remit/Transaction/Modify/ModifyLocation.aspx.designer.cs b/Swift.web/Remit/Transaction/Modify/ModifyLocation.aspx.designer.cs
index a66b978..30f1683 100644
--- a/Swift.web/Remit/Transaction/Modify/ModifyLocation.aspx.designer.cs
+++ b/Swift.web/Remit/Transaction/Modify/ModifyLocation.aspx.designer.cs
@@ -158,6 +158,24 @@ namespace Swift.web.Remit.Transaction.Modify
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList ddlBranch;
 
+        /// <summary>
+        /// modeOfPayment control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTableRow modeOfPayment;
+
+        /// <summary>
+        /// ddlPaymnetMode control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.DropDownList ddlPaymnetMode;
+
         /// <summary>
         /// rptAccountNo control.
         /// </summary>
diff --git a/Swift.web/Remit/Transaction/Modify/ModifyTran.aspx b/Swift.web/Remit/Transaction/Modify/ModifyTran.aspx
index fc082b4..53d70d0 100644
--- a/Swift.web/Remit/Transaction/Modify/ModifyTran.aspx
+++ b/Swift.web/Remit/Transaction/Modify/ModifyTran.aspx
@@ -160,5 +160,19 @@
         }
         return false;
     }
+    function EditPaymentMode(label, fieldName, oldValue, tranId, pCountry) {
+        var url = "ModifyField.aspx?label=" + label +
+            "&fieldName=" + fieldName +
+            "&oldValue=" + oldValue +
+            "&tranId=" + tranId +
+            "&pCountry=" + pCountry;
+        var id = PopUpWindow(url, "");
+        if (id == "undefined" || id == null || id == "") {
+        }
+        else {
+            GetElement("<%=btnReloadDetail.ClientID %>").click();
+        }
+        return false;
+    }
 </script>
 </html>
diff --git a/Swift.web/Remit/Transaction/ReprintVoucher/List.aspx b/Swift.web/Remit/Transaction/ReprintVoucher/List.aspx
index cd64abd..e69c8c2 100644
--- a/Swift.web/Remit/Transaction/ReprintVoucher/List.aspx
+++ b/Swift.web/Remit/Transaction/ReprintVoucher/List.aspx
@@ -63,7 +63,7 @@
                         <div class="panel-body">
                             <div class="row">
                                 <div class="col-md-2 form-group">
-                                    <label>JME No.<span style="color: red;">*</span></label>
+                                    <label>IME No.<span style="color: red;">*</span></label>
                                 </div>
                                 <div class="col-md-4 form-group">
                                     <input type="text" class="form-control" id="controlNo" />
diff --git a/Swift.web/Remit/UserControl/UcTransaction.ascx.cs b/Swift.web/Remit/UserControl/UcTransaction.ascx.cs
index dff8f39..6e2d72c 100644
--- a/Swift.web/Remit/UserControl/UcTransaction.ascx.cs
+++ b/Swift.web/Remit/UserControl/UcTransaction.ascx.cs
@@ -374,7 +374,8 @@ namespace Swift.web.Remit.UserControl
                     }
 
                     pAgentName.Text = tRow["pAgentName"].ToString();
-                    modeOfPayment.Text = tRow["paymentMethod"].ToString();
+                    //modeOfPayment.Text = tRow["paymentMethod"].ToString();
+                    modeOfPayment.Text = GetPaymentMode("Mode of Payment", "paymentMethod", tRow);
                     modeOfDeposit.Text = tRow["depositType"].ToString();
                     payer.Text = tRow["payerName"].ToString();
 
@@ -861,6 +862,13 @@ namespace Swift.web.Remit.UserControl
               fieldValue + "<img border=0 src=\"/Images/edit.gif\"/></a></div>";
             return str;
         }
+        public string GetPaymentMode(string label, string fieldName, DataRow dr)
+        {
+            string fieldValue = dr[fieldName].ToString().Trim();
+            var str = "<a href=# title='Edit Record'><div class = \"link\" onclick = \"EditPaymentMode('" + label + "', '" + fieldName + "', '" + fieldValue + "','" + hddTranId.Value + "','" + dr["rCountryName"] + "')\">" +
+              fieldValue + "<img border=0 src=\"/Images/edit.gif\"/></a></div>";
+            return str;
+        }
 
         public void SearchData()
         {
@@ -1717,7 +1725,8 @@ namespace Swift.web.Remit.UserControl
                         pBranchName.Text = tRow["pBranchName"].ToString();
                     }
                     pAgentName.Text = tRow["pAgentName"].ToString();
-                    modeOfPayment.Text = tRow["paymentMethod"].ToString();
+                    //modeOfPayment.Text = tRow["paymentMethod"].ToString();
+                    modeOfPayment.Text = GetPaymentMode("Mode of Payment", "paymentMethod", tRow);
                     modeOfDeposit.Text = tRow["depositType"].ToString();
                     tranStatus.Text = tRow["tranStatus"].ToString();
                     payStatus.Text = tRow["payStatus"].ToString();