diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py
index d2df427cf..cebb5c0b2 100644
--- a/lnbits/extensions/diagonalley/crud.py
+++ b/lnbits/extensions/diagonalley/crud.py
@@ -102,7 +102,7 @@ async def create_diagonalley_zone(
         f"""
         INSERT INTO diagonalley.zones (
             id,
-            user,
+            "user",
             cost,
             countries
 
@@ -133,7 +133,7 @@ async def get_diagonalley_zone(zone_id: str) -> Optional[Zones]:
 
 
 async def get_diagonalley_zones(user: str) -> List[Zones]:
-    rows = await db.fetchall("SELECT * FROM diagonalley.zones WHERE user = ?", (user,))
+    rows = await db.fetchall('SELECT * FROM diagonalley.zones WHERE "user" = ?', (user,))
     return [Zones(**row) for row in rows]
 
 
diff --git a/lnbits/extensions/diagonalley/migrations.py b/lnbits/extensions/diagonalley/migrations.py
index 29a844191..11cd2d117 100644
--- a/lnbits/extensions/diagonalley/migrations.py
+++ b/lnbits/extensions/diagonalley/migrations.py
@@ -26,9 +26,9 @@ async def m001_initial(db):
             id TEXT PRIMARY KEY,
             wallet TEXT NOT NULL,
             name TEXT NOT NULL,
-            publickey TEXT NOT NULL,
-            privatekey TEXT NOT NULL,
-            relays TEXT NOT NULL,
+            publickey TEXT,
+            privatekey TEXT,
+            relays TEXT,
             shippingzones TEXT NOT NULL
         );
     """
@@ -41,7 +41,7 @@ async def m001_initial(db):
         """
         CREATE TABLE diagonalley.zones (
             id TEXT PRIMARY KEY,
-            user TEXT NOT NULL,
+            "user" TEXT NOT NULL,
             cost TEXT NOT NULL,
             countries TEXT NOT NULL
         );
@@ -65,7 +65,10 @@ async def m001_initial(db):
             email TEXT NOT NULL,
             invoiceid TEXT NOT NULL,
             paid BOOLEAN NOT NULL,
-            shipped BOOLEAN NOT NULL
+            shipped BOOLEAN NOT NULL,
+            time TIMESTAMP NOT NULL DEFAULT """
+        + db.timestamp_now
+        + """
         );
     """
     )