diff --git a/account/src/User/ConfirmEmail.js b/account/src/User/ConfirmEmail.js
index a6944fd..5339757 100644
--- a/account/src/User/ConfirmEmail.js
+++ b/account/src/User/ConfirmEmail.js
@@ -44,7 +44,7 @@ const ConfirmEmail = (props) => {
           <Message.Content>
             <Message.Header>Success</Message.Header>
             <p>You have successfully confirmed you email address.</p>
-            <Link to="/login">
+            <Link to="/login?nextLocation=admin">
               <Button
                 size="large"
                 content="Continue to Login"
diff --git a/account/src/User/Login.js b/account/src/User/Login.js
index 97418d9..d6e1db5 100644
--- a/account/src/User/Login.js
+++ b/account/src/User/Login.js
@@ -48,9 +48,12 @@ const Login = (props) => {
               window.location =  process.env.REACT_APP_FRONTEND_SERVER;
               break;
               default:
-              case "admin":
-                window.location =  process.env.REACT_APP_ADMIN_SERVER;
-                break;
+            case "admin":
+              window.location =  process.env.REACT_APP_ADMIN_SERVER;
+              break;
+            case "account":
+              navigate("/");
+              break;
           }
         } else {
           navigate("/");
diff --git a/backend/controllers/talkgroups.js b/backend/controllers/talkgroups.js
index 2835f61..b3cacc9 100644
--- a/backend/controllers/talkgroups.js
+++ b/backend/controllers/talkgroups.js
@@ -10,7 +10,7 @@ exports.get_talkgroups = async function (req, res) {
       
     var talkgroups = {};
     for (var tg in tg_results) {
-        var talkgroup = {num: tg_results[tg].num, alpha: tg_results[tg].alpha, description: tg_results[tg].description}
+        var talkgroup = {_id: tg_results[tg]._id, num: tg_results[tg].num, alpha: tg_results[tg].alpha, description: tg_results[tg].description}
         talkgroups[tg_results[tg].num] = talkgroup;
     }
     res.contentType('json');
diff --git a/frontend/src/Main/Main.js b/frontend/src/Main/Main.js
index feb5e5d..e8bf294 100644
--- a/frontend/src/Main/Main.js
+++ b/frontend/src/Main/Main.js
@@ -284,8 +284,8 @@ const Main = (props) => {
         </Grid.Column>
       </Grid.Row>
     </Grid>
-
     </Segment>
+
     <Segment style={{ padding: '0em' }} vertical>
       <Grid celled='internally' columns='equal' stackable>
         <Grid.Row textAlign='center'>