diff --git a/client/modules/User/actions.js b/client/modules/User/actions.js
index 93a874fb..3c2f6d5b 100644
--- a/client/modules/User/actions.js
+++ b/client/modules/User/actions.js
@@ -1,5 +1,6 @@
 import { browserHistory } from 'react-router';
 import axios from 'axios';
+import crypto from 'crypto';
 import * as ActionTypes from '../../constants';
 import { showErrorModal, justOpenedProject } from '../IDE/actions/ide';
 import { showToast, setToastText } from '../IDE/actions/toast';
diff --git a/client/modules/User/pages/AccountView.jsx b/client/modules/User/pages/AccountView.jsx
index 7382656e..35fa127f 100644
--- a/client/modules/User/pages/AccountView.jsx
+++ b/client/modules/User/pages/AccountView.jsx
@@ -1,11 +1,10 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-import { reduxForm } from 'redux-form';
+import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import { browserHistory } from 'react-router';
 import { Tab, Tabs, TabList, TabPanel } from 'react-tabs';
 import InlineSVG from 'react-inlinesvg';
-import axios from 'axios';
 import { Helmet } from 'react-helmet';
 import { updateSettings, initiateVerification, createApiKey, removeApiKey } from '../actions';
 import AccountForm from '../components/AccountForm';
@@ -114,10 +113,4 @@ AccountView.propTypes = {
   theme: PropTypes.string.isRequired
 };
 
-export default reduxForm({
-  form: 'updateAllSettings',
-  fields: ['username', 'email', 'currentPassword', 'newPassword'],
-  validate: validateSettings,
-  asyncValidate,
-  asyncBlurFields: ['username', 'email', 'currentPassword']
-}, mapStateToProps, mapDispatchToProps)(AccountView);
+export default connect(mapStateToProps, mapDispatchToProps)(AdvancedSettingsView);
diff --git a/client/modules/User/reducers.js b/client/modules/User/reducers.js
index 00454acd..b298724d 100644
--- a/client/modules/User/reducers.js
+++ b/client/modules/User/reducers.js
@@ -31,9 +31,15 @@ const user = (state = { authenticated: false }, action) => {
       return Object.assign({}, state, { emailVerificationTokenState: 'invalid' });
     case ActionTypes.SETTINGS_UPDATED:
       return { ...state, ...action.user };
+<<<<<<< HEAD
     case ActionTypes.API_KEY_REMOVED:
       return { ...state, ...action.user };
     case ActionTypes.API_KEY_CREATED:
+=======
+    case ActionTypes.REMOVED_API_KEY:
+      return { ...state, ...action.user };
+    case ActionTypes.ADDED_API_KEY:
+>>>>>>> You can now generate keys from the advanced settings interface
       return { ...state, ...action.user };
     default:
       return state;