diff --git a/src/components/management/AccountManager/MyAccount.jsx b/src/components/management/AccountManager/MyAccount.jsx
index aa94f49..9c4c806 100644
--- a/src/components/management/AccountManager/MyAccount.jsx
+++ b/src/components/management/AccountManager/MyAccount.jsx
@@ -2,7 +2,7 @@ import Inferno from 'inferno';
 import { Component } from 'inferno';
 import PropTypes from 'prop-types';
 
-export class LoginForm extends Component {
+export class MyAccount extends Component {
   constructor(props) {
     super(props);
 
@@ -29,8 +29,63 @@ export class LoginForm extends Component {
   
   render() {
     return (
-      <div className='content has-text-left'>
-        <p>Hello My Account!</p>
+      <div>
+        <div className="columns">
+        
+          <div className="column">
+            <h2 className="title">Account Details</h2>
+            <div className="control">
+              <strong>Email:</strong> <span>{this.state.email}</span>
+            </div>
+            <div className="control">
+              <strong>Username:</strong> <span>{this.state.username}</span>
+            </div>
+            <div className="field">
+              <label className="label">
+                <span>Public Name:</span>
+              </label>
+              <div className="control">
+                <input className="input" type="text" value={this.state.publicName}
+                  onInput={(event) => {this.setState({publicName: event.target.value})}} />
+              </div>
+            </div>
+            <div className="field">
+              <div className="control">
+                <label className="label checkbox">
+                  <input type="checkbox" checked={this.state.allowEmails ? 'checked' : null}
+                    onChange={(event) => { this.setState({ allowEmails: event.target.checked }) }} />
+                  <span>Allow Emails</span>
+                </label>
+              </div>
+            </div>
+            <div className="field">
+              <label className="label checkbox">
+                <input type="checkbox" checked={this.state.useIPAPronunciation ? 'checked' : null}
+                  onChange={(event) => { this.setState({ useIPAPronunciation: event.target.checked }) }} />
+                <span>Use IPA in Pronunciation Fields</span>
+              </label>
+            </div>
+          </div>
+          
+          <div className="column">
+            <h2 className="title">Account Actions</h2>
+            <div className="field">
+              <label className="label">
+                <span>Change Dictionary</span>
+              </label>
+              <div className="control">
+                <div className="select">
+                  <select>
+                    {this.props.userDictionaries.map(item => {
+                      return <option value={item.id}>{item.name}</option>;
+                    })}
+                  </select>
+                </div>
+              </div>
+            </div>
+          </div>
+          
+        </div>
       </div>
     );
   }
diff --git a/src/components/management/AccountManager/index.jsx b/src/components/management/AccountManager/index.jsx
index bef4565..c01f855 100644
--- a/src/components/management/AccountManager/index.jsx
+++ b/src/components/management/AccountManager/index.jsx
@@ -6,7 +6,7 @@ import store from 'store';
 
 import { Modal } from '../../structure/Modal';
 import { LoginForm } from './LoginForm';
-// import { MyAccount } from './MyAccount';
+import { MyAccount } from './MyAccount';
 
 import { request } from '../../../Helpers';
 
@@ -124,17 +124,15 @@ export class AccountManager extends Component {
       return (
         <div>
           <Modal buttonText='Account' title='My Account' onShow={ this.getDictionaryNames.bind(this) }>
-            <div className='content has-text-left'>
-              <p>Hello My Account!</p>
-            </div>
-            {/* <MyAccount
+            <MyAccount
               email={ userData.email }
               username={ userData.username }
               publicName={ userData.publicName }
               allowEmails={ userData.allowEmails }
               useIPAPronunciation={ userData.useIPAPronunciation }
+              userDictionaries={ this.state.userDictionaries }
               updateUserData={ this.updateUserData.bind(this) }
-              changeDictionary={ () => {} } /> */}
+              changeDictionary={ () => {} } />
           </Modal>
           <a className='button' onClick={this.logOut.bind(this)}>
             Log Out