diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx
index dede93d20..7f6008a99 100644
--- a/client/homebrew/pages/editPage/editPage.jsx
+++ b/client/homebrew/pages/editPage/editPage.jsx
@@ -137,8 +137,10 @@ const EditPage = createClass({
 
 	toggleGoogleStorage : function(){
 		this.setState((prevState)=>({
-			saveGoogle : !prevState.saveGoogle
-		}));
+			saveGoogle : !prevState.saveGoogle,
+			isSaving   : false,
+			errors     : null
+		}), ()=>this.trySave());
 	},
 
 	save : async function(){
diff --git a/client/homebrew/pages/newPage/newPage.jsx b/client/homebrew/pages/newPage/newPage.jsx
index e875b3c05..2fcc27481 100644
--- a/client/homebrew/pages/newPage/newPage.jsx
+++ b/client/homebrew/pages/newPage/newPage.jsx
@@ -35,7 +35,7 @@ const NewPage = createClass({
 
 			text       : '',
 			isSaving   : false,
-			saveGoogle : (global.account.googleId ? true : false),
+			saveGoogle : (global.account && global.account.googleId ? true : false),
 			errors     : []
 		};
 	},
diff --git a/server.js b/server.js
index cebdb8ad9..835f06432 100644
--- a/server.js
+++ b/server.js
@@ -96,7 +96,7 @@ app.get('/user/:username', async (req, res, next)=>{
 
 	let googleBrews = [];
 
-	if(req.account.googleId){
+	if(req.account && req.account.googleId){
 		console.log('GETTING DATA FOR USER PAGE');
 		googleBrews = await GoogleActions.listGoogleBrews(req, res)
 		.catch((err)=>{
diff --git a/server/googleActions.js b/server/googleActions.js
index 6f3ea67d0..7d4037d4b 100644
--- a/server/googleActions.js
+++ b/server/googleActions.js
@@ -1,3 +1,4 @@
+/* eslint-disable max-lines */
 const _ = require('lodash');
 const { google } = require('googleapis');
 const { nanoid } = require('nanoid');