diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/h2.sql b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/h2.sql
index adf40449621..b75cbd2295c 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/h2.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/h2.sql
@@ -577,6 +577,8 @@ CREATE TABLE IF NOT EXISTS DM_OTP_DATA (
    ID INT AUTO_INCREMENT NOT NULL,
    OTP_TOKEN VARCHAR(100) NOT NULL,
    TENANT_DOMAIN VARCHAR(20) NOT NULL,
+   TENANT_ID INT NOT NULL,
+   USERNAME  VARCHAR(500) DEFAULT NOT NULL,
    EMAIL VARCHAR(100) NOT NULL,
    EMAIL_TYPE VARCHAR(20) NOT NULL,
    META_INFO VARCHAR(20000) NOT NULL,
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mssql.sql b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mssql.sql
index cbed63388db..90171e6735d 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mssql.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mssql.sql
@@ -619,6 +619,8 @@ CREATE TABLE DM_OTP_DATA (
      ID INT IDENTITY NOT NULL,
      OTP_TOKEN VARCHAR(100) NOT NULL,
      TENANT_DOMAIN VARCHAR(20) NOT NULL,
+     TENANT_ID INTEGER NOT NULL,
+     USERNAME VARCHAR(500) NOT NULL,
      EMAIL VARCHAR(100) NOT NULL,
      EMAIL_TYPE VARCHAR(20) NOT NULL,
      META_INFO VARCHAR(20000) NOT NULL,
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mysql.sql b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mysql.sql
index a3dff752c3a..42e103963b3 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mysql.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mysql.sql
@@ -635,6 +635,8 @@ CREATE TABLE IF NOT EXISTS DM_OTP_DATA (
    ID INT AUTO_INCREMENT NOT NULL,
    OTP_TOKEN VARCHAR(100) NOT NULL,
    TENANT_DOMAIN VARCHAR(20) NOT NULL,
+   TENANT_ID INT NOT NULL,
+   USERNAME VARCHAR(500) NOT NULL,
    EMAIL VARCHAR(100) NOT NULL,
    EMAIL_TYPE VARCHAR(20) NOT NULL,
    META_INFO VARCHAR(20000) NOT NULL,
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/oracle.sql b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/oracle.sql
index 41a10d8ffe1..da01528e687 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/oracle.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/oracle.sql
@@ -983,6 +983,8 @@ CREATE TABLE DM_OTP_DATA (
      ID NUMBER(10) NOT NULL,
      OTP_TOKEN VARCHAR2(100) NOT NULL,
      TENANT_DOMAIN VARCHAR(20) NOT NULL,
+     TENANT_ID INTEGER NOT NULL,
+     USERNAME VARCHAR(500) NOT NULL,
      EMAIL VARCHAR2(100) NOT NULL,
      EMAIL_TYPE VARCHAR2(20) NOT NULL,
      META_INFO VARCHAR2(20000) NOT NULL,
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/postgresql.sql b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/postgresql.sql
index c8c25534ae2..279494c5daf 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/postgresql.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/postgresql.sql
@@ -624,6 +624,8 @@ CREATE TABLE IF NOT EXISTS DM_OTP_DATA (
    ID INT DEFAULT NEXTVAL ('DM_OTP_DATA_seq') NOT NULL,
    OTP_TOKEN VARCHAR(100) NOT NULL,
    TENANT_DOMAIN VARCHAR(20) NOT NULL,
+   TENANT_ID INTEGER NOT NULL,
+   USERNAME VARCHAR(500) NOT NULL,
    EMAIL VARCHAR(100) NOT NULL,
    EMAIL_TYPE VARCHAR(20) NOT NULL,
    META_INFO VARCHAR(20000) NOT NULL,