diff --git a/backend/go-app/main.go b/backend/go-app/main.go
index cad49aa4..5f246044 100644
--- a/backend/go-app/main.go
+++ b/backend/go-app/main.go
@@ -2872,8 +2872,8 @@ func setUser(ctx context.Context, data *User) error {
 
 // Used for testing only. Shouldn't impact production.
 func handleCors(resp http.ResponseWriter, request *http.Request) bool {
-	//allowedOrigins := "*"
-	allowedOrigins := "http://localhost:3000"
+	//allowedOrigins := "http://localhost:3000"
+	allowedOrigins := "http://localhost:3002"
 
 	resp.Header().Set("Vary", "Origin")
 	resp.Header().Set("Access-Control-Allow-Headers", "Content-Type, Accept, X-Requested-With, remember-me")
diff --git a/backend/go-app/walkoff.go b/backend/go-app/walkoff.go
index d12d969d..30984f02 100644
--- a/backend/go-app/walkoff.go
+++ b/backend/go-app/walkoff.go
@@ -5211,7 +5211,8 @@ func getWorkflowApps(resp http.ResponseWriter, request *http.Request) {
 		return
 	}
 
-	// FIXME - set this to be per user IF logged in, as there might exist private and public
+	// FIXME - set this to be per user IF logged in,
+	// as there might exist private and public
 	//memcacheName := "all_apps"
 
 	ctx := context.Background()
@@ -5219,10 +5220,11 @@ func getWorkflowApps(resp http.ResponseWriter, request *http.Request) {
 	// FIXME - need to be logged in?
 	user, userErr := handleApiAuthentication(resp, request)
 	if userErr != nil {
-		log.Printf("Api authentication failed in get all apps: %s", userErr)
-		resp.WriteHeader(401)
-		resp.Write([]byte(`{"success": false}`))
-		return
+		log.Printf("Continuing with apps even without auth")
+		//log.Printf("Api authentication failed in get all apps: %s", userErr)
+		//resp.WriteHeader(401)
+		//resp.Write([]byte(`{"success": false}`))
+		//return
 	}
 
 	//if item, err := memcache.Get(ctx, memcacheName); err == memcache.ErrCacheMiss {
@@ -5268,9 +5270,9 @@ func getWorkflowApps(resp http.ResponseWriter, request *http.Request) {
 	newapps := []WorkflowApp{}
 	baseApps := []WorkflowApp{}
 	for _, workflowapp := range workflowapps {
-		if !workflowapp.Activated && workflowapp.Generated {
-			continue
-		}
+		//if !workflowapp.Activated && workflowapp.Generated {
+		//	continue
+		//}
 
 		if workflowapp.Owner != user.Id && user.Role != "admin" && !workflowapp.Sharing {
 			continue
diff --git a/frontend/src/views/Admin.jsx b/frontend/src/views/Admin.jsx
index f188438b..17c18eed 100644
--- a/frontend/src/views/Admin.jsx
+++ b/frontend/src/views/Admin.jsx
@@ -1496,7 +1496,7 @@ const Admin = (props) => {
 						})}
 					</Grid>
 					<Divider style={{ marginTop: 20, marginBottom: 20, backgroundColor: theme.palette.inputColor }} />
-					{isCloud && selectedOrganization.subscriptions !== null && selectedOrganization.subscriptions.length > 0 ? 
+					{isCloud && selectedOrganization.subscriptions !== undefined && selectedOrganization.subscriptions !== null && selectedOrganization.subscriptions.length > 0 ? 
 						<div style={{marginTop: 30, marginBottom: 20}}>
 							<Typography style={{marginTop: 40, marginLeft: 10, marginBottom: 5,}}>
 								Your subscription{selectedOrganization.subscriptions.length > 1 ? "s" : ""}