diff --git a/assets/tpl/admin_edit_user.html b/assets/tpl/admin_edit_user.html
index 97729b0..166e98c 100644
--- a/assets/tpl/admin_edit_user.html
+++ b/assets/tpl/admin_edit_user.html
@@ -14,7 +14,7 @@
 {{template "prt_nav.html" .}}
 <div class="container mt-5">
     {{if eq .User.CreatedAt .Epoch}}
-    <h1>Create a new user</h1>
+    <h1>Create a new user</h1><!-- fix me!!! -.>
     {{else}}
     <h1>Edit user <strong>{{.User.Email}}</strong></h1>
     {{end}}
diff --git a/internal/server/handlers_user.go b/internal/server/handlers_user.go
index 0bdfc95..da8df70 100644
--- a/internal/server/handlers_user.go
+++ b/internal/server/handlers_user.go
@@ -78,6 +78,7 @@ func (s *Server) GetAdminUsersEdit(c *gin.Context) {
 		"User":        currentSession.FormData.(users.User),
 		"Device":      s.peers.GetDevice(currentSession.DeviceName),
 		"DeviceNames": s.wg.Cfg.DeviceNames,
+		"Epoch":       time.Time{},
 	})
 }
 
@@ -154,6 +155,7 @@ func (s *Server) GetAdminUsersCreate(c *gin.Context) {
 		"User":        currentSession.FormData.(users.User),
 		"Device":      s.peers.GetDevice(currentSession.DeviceName),
 		"DeviceNames": s.wg.Cfg.DeviceNames,
+		"Epoch":       time.Time{},
 	})
 }