diff --git a/dmp-db-scema/main/dmp-dump.sql b/dmp-db-scema/main/dmp-dump.sql
index 5355516e4..052a0007e 100644
--- a/dmp-db-scema/main/dmp-dump.sql
+++ b/dmp-db-scema/main/dmp-dump.sql
@@ -59,6 +59,7 @@ CREATE TABLE public."Credential" (
     "Status" numeric NOT NULL,
     "Provider" numeric NOT NULL,
     "Public" character varying NOT NULL,
+	"Email" character varying,
     "Secret" character varying NOT NULL,
     "CreationTime" timestamp(4) with time zone NOT NULL,
     "LastUpdateTime" timestamp(4) with time zone NOT NULL,
@@ -571,13 +572,14 @@ ALTER TABLE public."Lock" OWNER TO :POSTGRES_USER;
 -- Name: LoginConfirmationEmail; Type: TABLE; Schema: public; Owner: :POSTGRES_USER
 --
 
-CREATE TABLE public."LoginConfirmationEmail" (
+CREATE TABLE public."EmailConfirmation" (
     "ID" uuid NOT NULL,
     email character varying NOT NULL,
     "isConfirmed" boolean NOT NULL,
     token uuid NOT NULL,
     "userId" uuid NOT NULL,
-    "expiresAt" timestamp(4) with time zone NOT NULL
+    "expiresAt" timestamp(4) with time zone NOT NULL,
+	data text
 );
 
 
diff --git a/dmp-db-scema/updates/00.00.006_Update_Credential_and_LoginConfirmationEmail_tables.sql b/dmp-db-scema/updates/00.00.006_Update_Credential_and_LoginConfirmationEmail_tables.sql
new file mode 100644
index 000000000..0a444456c
--- /dev/null
+++ b/dmp-db-scema/updates/00.00.006_Update_Credential_and_LoginConfirmationEmail_tables.sql
@@ -0,0 +1,16 @@
+DO $$DECLARE
+   this_version CONSTANT varchar := '00.00.006';
+BEGIN
+   PERFORM * FROM "DBVersion" WHERE version = this_version;
+   IF FOUND THEN RETURN; END IF;
+
+   ALTER TABLE public."Credential" ADD COLUMN email character varying;
+   
+   ALTER TABLE public."LoginConfirmationEmail" RENAME TO "EmailConfirmation";
+   
+   ALTER TABLE public."EmailConfirmation" ADD COLUMN data text;
+   
+   UPDATE public."Credential" cred SET "Email"= u.email FROM public."UserInfo" u WHERE cred."UserId" = u.id;
+   
+   INSERT INTO public."DBVersion" VALUES ('DMPDB', '00.00.006', '2020-10-26 10:10:00.000000+03', now(), 'Update Credential and LoginConfirmationEmail tables');
+END$$;
\ No newline at end of file
diff --git a/dmp-db-scema/updates/00.00.006_add_email_to_credential.sql b/dmp-db-scema/updates/00.00.006_add_email_to_credential.sql
deleted file mode 100644
index f60e3ceb1..000000000
--- a/dmp-db-scema/updates/00.00.006_add_email_to_credential.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE public."Credential" ADD COLUMN email character varying;
diff --git a/dmp-db-scema/updates/00.00.007_rename_LogicConfirmationEmail_to_EmailConfirmation - Αντιγραφή.sql b/dmp-db-scema/updates/00.00.007_rename_LogicConfirmationEmail_to_EmailConfirmation - Αντιγραφή.sql
deleted file mode 100644
index a43076fc9..000000000
--- a/dmp-db-scema/updates/00.00.007_rename_LogicConfirmationEmail_to_EmailConfirmation - Αντιγραφή.sql	
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE public."LoginConfirmationEmail" RENAME TO "EmailConfirmation";
\ No newline at end of file
diff --git a/dmp-db-scema/updates/00.00.008_add_column_data_to_EmailConfirmation.sql b/dmp-db-scema/updates/00.00.008_add_column_data_to_EmailConfirmation.sql
deleted file mode 100644
index 38b964a5a..000000000
--- a/dmp-db-scema/updates/00.00.008_add_column_data_to_EmailConfirmation.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE public."EmailConfirmation" ADD COLUMN data text;
\ No newline at end of file