diff --git a/server/package-lock.json b/server/package-lock.json
index 703087f6f..4000d0856 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@scrypted/server",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrypted/server",
-      "version": "0.4.5",
+      "version": "0.4.6",
       "license": "ISC",
       "dependencies": {
         "@ffmpeg-installer/ffmpeg": "^1.1.0",
diff --git a/server/package.json b/server/package.json
index b27b9e6e2..7def48565 100644
--- a/server/package.json
+++ b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scrypted/server",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "description": "",
   "dependencies": {
     "@ffmpeg-installer/ffmpeg": "^1.1.0",
diff --git a/server/src/event-registry.ts b/server/src/event-registry.ts
index fb42d7cfd..20ffa9569 100644
--- a/server/src/event-registry.ts
+++ b/server/src/event-registry.ts
@@ -1,5 +1,4 @@
 import { EventDetails, EventListenerOptions, EventListenerRegister, ScryptedInterface, SystemDeviceState } from "@scrypted/types";
-import crypto from 'crypto';
 
 export class EventListenerRegisterImpl implements EventListenerRegister {
     removeListener: () => void;
@@ -51,7 +50,7 @@ export class EventRegistry {
             return false;
 
         const eventDetails: EventDetails = {
-            eventId: crypto.randomBytes(8).toString("base64"),
+            eventId: Math.random().toString(),
             changed,
             eventInterface,
             eventTime,
diff --git a/server/src/scrypted-server-main.ts b/server/src/scrypted-server-main.ts
index 6c95f670f..e7804feb8 100644
--- a/server/src/scrypted-server-main.ts
+++ b/server/src/scrypted-server-main.ts
@@ -439,8 +439,6 @@ async function start() {
     }
 
     app.post('/login', async (req, res) => {
-        await checkResetLogin();
-
         const { username, password, change_password, maxAge: maxAgeRequested } = req.body;
         const timestamp = Date.now();
         const maxAge = parseInt(maxAgeRequested) || ONE_DAY_MILLISECONDS;
@@ -531,6 +529,8 @@ async function start() {
 
 
     app.get('/login', async (req, res) => {
+        await checkResetLogin();
+
         scrypted.addAccessControlHeaders(req, res);
         const hostname = os.hostname()?.split('.')?.[0];