diff --git a/public/js/app.js b/public/js/app.js
index 6f6932d..b3df7f0 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -791,6 +791,13 @@ function submitLogin() {
     currentUser = name;
     sessionStorage.setItem('webgis_user', currentUser);
     document.getElementById('login-modal').style.display = 'none';
+
+    // Open Create Modal if Geometry is pending 
+    if (drawnGeometry) {
+        document.getElementById('create-geom').value = JSON.stringify(drawnGeometry);
+        document.getElementById('create-geom-type').value = drawnGeomType;
+        document.getElementById('create-modal').style.display = 'flex';
+    }
 }
 
 function skipLogin() {