diff --git a/config/sql/channel_videos.sql b/config/sql/channel_videos.sql
index 5dfe46508..985677808 100644
--- a/config/sql/channel_videos.sql
+++ b/config/sql/channel_videos.sql
@@ -4,36 +4,33 @@
 
 CREATE TABLE public.channel_videos
 (
-    id text COLLATE pg_catalog."default" NOT NULL,
-    title text COLLATE pg_catalog."default",
-    published timestamp with time zone,
-    updated timestamp with time zone,
-    ucid text COLLATE pg_catalog."default",
-    author text COLLATE pg_catalog."default",
-    length_seconds integer,
-    CONSTRAINT channel_videos_id_key UNIQUE (id)
-)
-WITH (
-    OIDS = FALSE
-)
-TABLESPACE pg_default;
+  id text NOT NULL,
+  title text,
+  published timestamp with time zone,
+  updated timestamp with time zone,
+  ucid text,
+  author text,
+  length_seconds integer,
+  CONSTRAINT channel_videos_id_key UNIQUE (id)
+);
 
 GRANT ALL ON TABLE public.channel_videos TO kemal;
 
--- Index: channel_videos_published_idx
+-- Index: public.channel_videos_published_idx
 
 -- DROP INDEX public.channel_videos_published_idx;
 
 CREATE INDEX channel_videos_published_idx
-    ON public.channel_videos USING btree
-    (published)
-    TABLESPACE pg_default;
+  ON public.channel_videos
+  USING btree
+  (published);
 
--- Index: channel_videos_ucid_idx
+-- Index: public.channel_videos_ucid_idx
 
 -- DROP INDEX public.channel_videos_ucid_idx;
 
 CREATE INDEX channel_videos_ucid_idx
-    ON public.channel_videos USING hash
-    (ucid COLLATE pg_catalog."default")
-    TABLESPACE pg_default;
\ No newline at end of file
+  ON public.channel_videos
+  USING hash
+  (ucid COLLATE pg_catalog."default");
+
diff --git a/config/sql/channels.sql b/config/sql/channels.sql
index a328bcad1..c4259c121 100644
--- a/config/sql/channels.sql
+++ b/config/sql/channels.sql
@@ -4,23 +4,20 @@
 
 CREATE TABLE public.channels
 (
-    id text COLLATE pg_catalog."default" NOT NULL,
-    author text COLLATE pg_catalog."default",
-    updated timestamp with time zone,
-    CONSTRAINT channels_id_key UNIQUE (id)
-)
-WITH (
-    OIDS = FALSE
-)
-TABLESPACE pg_default;
+  id text NOT NULL,
+  author text,
+  updated timestamp with time zone,
+  CONSTRAINT channels_id_key UNIQUE (id)
+);
 
 GRANT ALL ON TABLE public.channels TO kemal;
 
--- Index: channels_id_idx
+-- Index: public.channels_id_idx
 
 -- DROP INDEX public.channels_id_idx;
 
 CREATE INDEX channels_id_idx
-    ON public.channels USING btree
-    (id COLLATE pg_catalog."default")
-    TABLESPACE pg_default;
\ No newline at end of file
+  ON public.channels
+  USING btree
+  (id COLLATE pg_catalog."default");
+
diff --git a/config/sql/users.sql b/config/sql/users.sql
index 7f452e4ca..f806271c8 100644
--- a/config/sql/users.sql
+++ b/config/sql/users.sql
@@ -2,22 +2,28 @@
 
 -- DROP TABLE public.users;
 
-CREATE TABLE public.users 
+CREATE TABLE public.users
 (
-    id text[] COLLATE pg_catalog."default" NOT NULL,
-    updated timestamp with time zone,
-    notifications text[] COLLATE pg_catalog."default",
-    subscriptions text[] COLLATE pg_catalog."default",
-    email text COLLATE pg_catalog."default" NOT NULL,
-    preferences text COLLATE pg_catalog."default",
-    password text COLLATE pg_catalog."default",
-    token text COLLATE pg_catalog."default",
-    watched text[] COLLATE pg_catalog."default",
-    CONSTRAINT users_email_key UNIQUE (email)
-)
-WITH (
-    OIDS = FALSE
-)
-TABLESPACE pg_default;
+  id text[] NOT NULL,
+  updated timestamp with time zone,
+  notifications text[],
+  subscriptions text[],
+  email text NOT NULL,
+  preferences text,
+  password text,
+  token text,
+  watched text[],
+  CONSTRAINT users_email_key UNIQUE (email)
+);
 
 GRANT ALL ON TABLE public.users TO kemal;
+
+-- Index: public.email_unique_idx
+
+-- DROP INDEX public.email_unique_idx;
+
+CREATE UNIQUE INDEX email_unique_idx
+  ON public.users
+  USING btree
+  (lower(email) COLLATE pg_catalog."default");
+
diff --git a/config/sql/videos.sql b/config/sql/videos.sql
index b94405e9b..6ded01de2 100644
--- a/config/sql/videos.sql
+++ b/config/sql/videos.sql
@@ -4,40 +4,37 @@
 
 CREATE TABLE public.videos
 (
-    id text COLLATE pg_catalog."default" NOT NULL,
-    info text COLLATE pg_catalog."default",
-    updated timestamp with time zone,
-    title text COLLATE pg_catalog."default",
-    views bigint,
-    likes integer,
-    dislikes integer,
-    wilson_score double precision,
-    published timestamp with time zone,
-    description text COLLATE pg_catalog."default",
-    language text COLLATE pg_catalog."default",
-    author text COLLATE pg_catalog."default",
-    ucid text COLLATE pg_catalog."default",
-    allowed_regions text[] COLLATE pg_catalog."default",
-    is_family_friendly boolean,
-    genre text COLLATE pg_catalog."default",
-    genre_url text COLLATE pg_catalog."default",
-    license text COLLATE pg_catalog."default",
-    sub_count_text text COLLATE pg_catalog."default",
-    author_thumbnail text COLLATE pg_catalog."default",
-    CONSTRAINT videos_pkey PRIMARY KEY (id)
-)
-WITH (
-    OIDS = FALSE
-)
-TABLESPACE pg_default;
+  id text NOT NULL,
+  info text,
+  updated timestamp with time zone,
+  title text,
+  views bigint,
+  likes integer,
+  dislikes integer,
+  wilson_score double precision,
+  published timestamp with time zone,
+  description text,
+  language text,
+  author text,
+  ucid text,
+  allowed_regions text[],
+  is_family_friendly boolean,
+  genre text,
+  genre_url text,
+  license text,
+  sub_count_text text,
+  author_thumbnail text,
+  CONSTRAINT videos_pkey PRIMARY KEY (id)
+);
 
 GRANT ALL ON TABLE public.videos TO kemal;
 
--- Index: id_idx
+-- Index: public.id_idx
 
 -- DROP INDEX public.id_idx;
 
 CREATE UNIQUE INDEX id_idx
-    ON public.videos USING btree
-    (id COLLATE pg_catalog."default")
-    TABLESPACE pg_default;
\ No newline at end of file
+  ON public.videos
+  USING btree
+  (id COLLATE pg_catalog."default");
+