diff --git a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/dbscripts/dm-db-h2.sql b/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/dbscripts/dm-db-h2.sql
index 9737fd3df0..15c1604d31 100644
--- a/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/dbscripts/dm-db-h2.sql
+++ b/components/subtype-mgt/io.entgra.device.mgt.subtype.mgt/src/test/resources/carbon-home/dbscripts/dm-db-h2.sql
@@ -588,8 +588,7 @@ CREATE TABLE IF NOT EXISTS DM_OTP_DATA (
    CREATED_AT TIMESTAMP NOT NULL,
    EXPIRY_TIME INT NOT NULL DEFAULT 3600,
    IS_EXPIRED BOOLEAN DEFAULT false,
-   PRIMARY KEY (ID),
-   CONSTRAINT email_type_uk UNIQUE (EMAIL, EMAIL_TYPE)
+   PRIMARY KEY (ID)
 );
 -- END OF DM_OTP_DATA TABLE --
 
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 30ef1d7d79..417964f133 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
@@ -600,8 +600,7 @@ CREATE TABLE IF NOT EXISTS DM_OTP_DATA (
    CREATED_AT TIMESTAMP NOT NULL,
    EXPIRY_TIME INT NOT NULL DEFAULT 3600,
    IS_EXPIRED BOOLEAN DEFAULT false,
-   PRIMARY KEY (ID),
-   CONSTRAINT email_type_uk UNIQUE (EMAIL, EMAIL_TYPE)
+   PRIMARY KEY (ID)
 );
 -- END OF DM_OTP_DATA TABLE --
 
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 af29b96e1a..b0f2ab6b70 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
@@ -660,8 +660,7 @@ CREATE TABLE DM_OTP_DATA (
      CREATED_AT DATETIME2(0) NOT NULL,
      EXPIRY_TIME INT NOT NULL DEFAULT 3600,
      IS_EXPIRED BIT DEFAULT 0,
-     PRIMARY KEY (ID),
-     CONSTRAINT email_type_uk UNIQUE (EMAIL, EMAIL_TYPE)
+     PRIMARY KEY (ID)
 );
 -- END OF DM_OTP_DATA TABLE --
 
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 afebcf6150..e17cafcd0b 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
@@ -657,8 +657,7 @@ CREATE TABLE IF NOT EXISTS DM_OTP_DATA (
    CREATED_AT TIMESTAMP NOT NULL,
    EXPIRY_TIME INT NOT NULL DEFAULT 3600,
    IS_EXPIRED BOOLEAN DEFAULT false,
-   PRIMARY KEY (ID),
-   CONSTRAINT email_type_uk UNIQUE (EMAIL, EMAIL_TYPE)
+   PRIMARY KEY (ID)
 );
 -- END OF DM_OTP_DATA TABLE --
 
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 73dcb320b4..1735b70372 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
@@ -1006,8 +1006,7 @@ CREATE TABLE DM_OTP_DATA (
      CREATED_AT TIMESTAMP(0) NOT NULL,
      EXPIRY_TIME NUMBER(10) DEFAULT 3600 NOT NULL,
      IS_EXPIRED CHAR(1) DEFAULT false,
-     PRIMARY KEY (ID),
-     CONSTRAINT email_type_uk UNIQUE (EMAIL, EMAIL_TYPE)
+     PRIMARY KEY (ID)
 );
 
 -- Generate ID using sequence and trigger
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 530083d967..78a21e52d4 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
@@ -662,8 +662,7 @@ CREATE TABLE IF NOT EXISTS DM_OTP_DATA (
    CREATED_AT TIMESTAMP(0) NOT NULL,
    EXPIRY_TIME INT NOT NULL DEFAULT 3600,
    IS_EXPIRED BOOLEAN DEFAULT false,
-   PRIMARY KEY (ID),
-   CONSTRAINT email_type_uk UNIQUE (EMAIL, EMAIL_TYPE)
+   PRIMARY KEY (ID)
 );
 
 -- END OF OPT-DATA TABLE --