diff --git a/src/app/components/BurgerMenu.js b/src/app/components/BurgerMenu.js
index aa118c15..f152d3e8 100644
--- a/src/app/components/BurgerMenu.js
+++ b/src/app/components/BurgerMenu.js
@@ -25,7 +25,7 @@ export default function BurgerMenu() {
       onStateChange={state => handleStateChange(state)}
       closeMenu={closeMenu}
     >
-      {userAddress === "none" ? (
+      {userAddress === undefined ? (
         <NavLink
           onClick={() => closeMenu()}
           to={"/join"}
@@ -35,7 +35,7 @@ export default function BurgerMenu() {
         </NavLink>
       ) : null}
 
-      {userAddress === "none" ? (
+      {userAddress === undefined ? (
         <NavLink onClick={() => closeMenu()} to={"/login"}>
           LOG IN
         </NavLink>
@@ -64,7 +64,7 @@ export default function BurgerMenu() {
         </a>
       </div>
 
-      {userAddress !== "none" ? (
+      {userAddress ? (
         <NavLink onClick={() => closeMenu()} to={`/profile/${userAddress}`}>
           <img className="app__nav__icon" src={IconUser} alt="icon"></img>
           MY PROFILE
diff --git a/src/app/components/NavBar.js b/src/app/components/NavBar.js
index 2b23cdeb..e1583c2e 100644
--- a/src/app/components/NavBar.js
+++ b/src/app/components/NavBar.js
@@ -22,7 +22,7 @@ function NavBar(props) {
 
       <div className="nav-bar__route-link-wrapper">
         {/* // Welcome button only rendered when user is logged out */}
-        {userAddress !== "none" ? null : (
+        {userAddress ? null : (
           <div
             className={
               path === "/"
@@ -67,7 +67,7 @@ function NavBar(props) {
         </div>
 
         {/* // My Profile button only rendered when user is logged in */}
-        {userAddress !== "none" ? (
+        {userAddress ? (
           <div
             className={
               path === `/profile/${userAddress}`
@@ -154,10 +154,9 @@ function NavBar(props) {
           </NavLink>
         </div>
       </div>
-
       <div>
-        {/* Show Join button when user is not logged in */}
-        {userAddress === "none" ? (
+        {/* Show Login and Join buttons when user is not logged in */}
+        {userAddress === undefined ? (
           <Fragment>
             <NavLink className="app__nav-link nav-bar__log-in-text" to="/login">
               <img className="app__nav__icon" src={IconUser} alt="icon"></img>
diff --git a/src/auth/auth-context.js b/src/auth/auth-context.js
index c2ca3405..56c3d8a3 100644
--- a/src/auth/auth-context.js
+++ b/src/auth/auth-context.js
@@ -27,7 +27,7 @@ function AuthProvider({ children }) {
   const [state, dispatch] = React.useReducer(authReducer, {
     isAuthenticating: false,
     authType: "",
-    userAddress: "none",
+    userAddress: undefined,
     authExpiry: ""
   });
 
diff --git a/src/submissions/components/MultipleObservationForm.js b/src/submissions/components/MultipleObservationForm.js
index 67961c7b..20da8ef8 100644
--- a/src/submissions/components/MultipleObservationForm.js
+++ b/src/submissions/components/MultipleObservationForm.js
@@ -63,7 +63,7 @@ export default function MultipleObservationForm() {
 
   return (
     <Fragment>
-      {userAddress === "none" ? (
+      {userAddress === undefined ? (
         <p className="app__error-message">
           You need to be logged in to submit your observations.
         </p>
@@ -135,7 +135,7 @@ export default function MultipleObservationForm() {
                 </span>
               </NavLink>
 
-              {userAddress === "none" ? null : (
+              {userAddress === undefined ? null : (
                 <button
                   type="submit"
                   className="submit__submit-button"
@@ -145,7 +145,7 @@ export default function MultipleObservationForm() {
                 </button>
               )}
             </div>
-            {userAddress === "none" ? null : (
+            {userAddress === undefined ? null : (
               <p className="submit__submit-warning">
                 Please keep in mind that this data will be automatically
                 recorded into TruSat's catalog of orbital positions, and
diff --git a/src/submissions/components/SingleObservationForm.js b/src/submissions/components/SingleObservationForm.js
index c04dac39..4d828f95 100644
--- a/src/submissions/components/SingleObservationForm.js
+++ b/src/submissions/components/SingleObservationForm.js
@@ -117,7 +117,7 @@ export default function SingleObservationForm() {
       }
     };
     // only do fetch if form does not already have their stations and user is logged in
-    if (userAddress !== "none" && observationStations === "") {
+    if (userAddress && observationStations === "") {
       fetchObservationStations();
     }
   }, [userAddress, observationStations]);
@@ -494,7 +494,7 @@ export default function SingleObservationForm() {
 
   return (
     <Fragment>
-      {userAddress === "none" ? (
+      {userAddress === undefined ? (
         <p className="app__error-message">
           You need to be logged in to submit your observations.
         </p>
@@ -1346,7 +1346,7 @@ export default function SingleObservationForm() {
                 </span>
               </NavLink>
 
-              {userAddress === "none" ? null : (
+              {userAddress === undefined ? null : (
                 <button
                   className="submit__submit-button"
                   style={
@@ -1357,7 +1357,7 @@ export default function SingleObservationForm() {
                 </button>
               )}
             </div>
-            {userAddress === "none" ? null : (
+            {userAddress === undefined ? null : (
               <p className="submit__submit-warning">
                 Please keep in mind that this data will be automatically
                 recorded into TruSat's catalog of orbital positions, and
diff --git a/src/views/AccountSettings.js b/src/views/AccountSettings.js
index 308589dd..b39bf5b6 100644
--- a/src/views/AccountSettings.js
+++ b/src/views/AccountSettings.js
@@ -70,7 +70,7 @@ function UserSettings({ history }) {
       setIsLoading(false);
     };
 
-    if (userAddress !== "none" && userAddress) {
+    if (userAddress !== undefined && userAddress) {
       doFetch();
     }
   }, [userAddress, authExpiry, profileDispatch]);
@@ -121,7 +121,7 @@ function UserSettings({ history }) {
     </p>
   ) : isLoading ? (
     <Spinner />
-  ) : userAddress === "none" ? (
+  ) : userAddress === undefined ? (
     <div className="app__error-message">
       You need to login{" "}
       <NavLink className="app__nav-link app__link" to="/login">
diff --git a/src/views/AddStation.js b/src/views/AddStation.js
index 734e0c29..2d6e3d97 100644
--- a/src/views/AddStation.js
+++ b/src/views/AddStation.js
@@ -70,7 +70,7 @@ export default function AddStation() {
     <div className="add-station">
       <h1 className="static-page__main-header--small">Add a location</h1>
       {/* Prompt user to log in so they can create a station */}
-      {userAddress === "none" ? (
+      {userAddress === undefined ? (
         <p className="app__error-message">
           You need to be logged in to add a station location.
         </p>
@@ -199,7 +199,7 @@ export default function AddStation() {
         ) : (
           <Fragment>
             {/* Only render button to submit form if user is logged in */}
-            {userAddress === "none" ? null : (
+            {userAddress === undefined ? null : (
               <button type="submit" className="station-form__button">
                 Add station
               </button>
diff --git a/src/views/LogIn.js b/src/views/LogIn.js
index f20e6165..dbaf73c8 100644
--- a/src/views/LogIn.js
+++ b/src/views/LogIn.js
@@ -9,9 +9,9 @@ export default function LogIn() {
   return (
     <div className="log-in__wrapper">
       <h1 className="log-in__header">
-        {userAddress !== "none" ? "You're logged in" : "Log in"}
+        {userAddress ? "You're logged in" : "Log in"}
       </h1>
-      {userAddress !== "none" ? (
+      {userAddress ? (
         <div className="login__success-wrapper">
           <NavLink className="app__nav-link" to={`/profile/${userAddress}`}>
             <span className="app__button--white">Go to Profile</span>
diff --git a/src/views/SignUp.js b/src/views/SignUp.js
index db295513..40ca477c 100644
--- a/src/views/SignUp.js
+++ b/src/views/SignUp.js
@@ -9,9 +9,9 @@ export default function SignUp() {
   return (
     <div className="sign-up__wrapper">
       <h1 className="sign-up__header">
-        {userAddress !== "none" ? "YOU'RE IN" : "Sign Up"}
+        {userAddress !== undefined ? "YOU'RE IN" : "Sign Up"}
       </h1>
-      {userAddress !== "none" ? (
+      {userAddress !== undefined ? (
         <div className="login__success-wrapper">
           <NavLink className="app__nav-link" to={`/profile/${userAddress}`}>
             <span className="app__button--white">Go to Profile</span>