diff --git a/.gitignore b/.gitignore
index bfc428d..6db8b95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@ ssh.pid
 #*#
 *~
 .*
+GTAGS
+GPATH
diff --git a/main.js b/main.js
index 1d82353..7701890 100644
--- a/main.js
+++ b/main.js
@@ -45,7 +45,7 @@ let initialState = {
     },
     ssh: {
         status: 'DISCONNECTED', // TODO: CD // TODO: Implement in WEBIF
-        cameraForwardPort: false,
+        camForwardPort: false,
         sshForwardPort: false,
         willReconnect: false,
         error: false
diff --git a/src/communicator.js b/src/communicator.js
index cfadb17..d795d38 100644
--- a/src/communicator.js
+++ b/src/communicator.js
@@ -33,7 +33,7 @@ const {
     SET_ERROR_RESOLVED,
     TRY_RECONNECT,
     HYDRATE,
-    SET_CONNECTED,
+    SET_SSH_REMOTE_PORTS,
     SET_DISCONNECTED,
     SET_SSH_CONNECTED
 } = require('./actions').actions;
@@ -177,10 +177,12 @@ Communicator.prototype.sendAction = function(action) {
         };
         break;
 
-    case SET_SSH_CONNECTED:
+    case SET_SSH_REMOTE_PORTS:
         change = {
-            port: state.ssh.sshForwardPort,
-            camForwardPort: state.ssh.camForwardPort
+            ssh: {
+                port: state.ssh.sshForwardPort,
+                camForwardPort: state.ssh.camForwardPort
+            }
         };
         break;
 
@@ -192,7 +194,8 @@ Communicator.prototype.sendAction = function(action) {
             config: state.config,
             haveSettings: true, // LEGACY
             ssh: {
-                port: state.ssh.sshForwardPort
+                port: state.ssh.sshForwardPort,
+                camForwardPort: state.ssh.camForwardPort
             }
         });
         return;
diff --git a/src/reducers.js b/src/reducers.js
index e29b807..f780a96 100644
--- a/src/reducers.js
+++ b/src/reducers.js
@@ -165,10 +165,10 @@ reducers.ssh = function(state = {
     enabled: false
 }, action) {
     switch (action.type) {
-        case SET_SSH_REMOTE_PORTS:
+    case SET_SSH_REMOTE_PORTS:
             return Object.assign({}, state, {
-                camForwardPort: action.camForwardPort,
-                sshForwardport: action.sshForwardPort
+                camForwardPort: action.data.camForwardPort,
+                sshForwardPort: action.data.sshForwardPort
             });
         case SET_SSH_CONNECTING:
             return Object.assign({}, state, {
@@ -176,7 +176,7 @@ reducers.ssh = function(state = {
                 error: false,
                 willReconnect: false
             });
-        case SET_SSH_CONNECTED:
+    case SET_SSH_CONNECTED:
             return Object.assign({}, state, {
                 status: 'CONNECTED',
                 willReconnect: false
diff --git a/todo b/todo
index 14e8187..6517dd7 100644
--- a/todo
+++ b/todo
@@ -5,6 +5,7 @@
 - host identity
 - config update
 - Patch submissionc
+- SSH Enable Option
 Host localhost
    StrictHostKeyChecking no
    UserKnownHostsFile=/dev/null