diff --git a/browser/main/Components/PersonalSettingModal.jsx b/browser/main/Components/PersonalSettingModal.jsx
index af73063a..09206ec7 100644
--- a/browser/main/Components/PersonalSettingModal.jsx
+++ b/browser/main/Components/PersonalSettingModal.jsx
@@ -6,6 +6,8 @@ var Catalyst = require('../Mixins/Catalyst')
 
 var AuthActions = require('../Actions/AuthActions')
 
+var AuthStore = require('../Stores/AuthStore')
+
 var apiUrl = 'http://localhost:8000/'
 
 module.exports = React.createClass({
@@ -17,6 +19,7 @@ module.exports = React.createClass({
   getInitialState: function () {
     return {
       currentTab: 'profile',
+      profileName: this.props.currentUser.profileName,
       userName: this.props.currentUser.name,
       email: this.props.currentUser.email,
       currentPassword: '',
@@ -26,6 +29,32 @@ module.exports = React.createClass({
       contactContent: ''
     }
   },
+  componentDidMount: function () {
+    this.unsubscribe = AuthStore.listen(this.onListen)
+  },
+  componentWillUnmount: function () {
+    this.unsubscribe()
+  },
+  onListen: function (res) {
+    console.log(res)
+    if (res.status === 'userProfileUpdated') {
+      this.setState({
+        isUpdatingProfile: false,
+        isUpdatingProfileDone: true,
+        isUpdatingProfileFailed: false
+      })
+      return
+    }
+
+    if (res.status === 'userProfileUpdatingFailed') {
+      this.setState({
+        isUpdatingProfile: false,
+        isUpdatingProfileDone: false,
+        isUpdatingProfileFailed: true
+      })
+      return
+    }
+  },
   activeProfile: function () {
     this.setState({currentTab: 'profile'})
   },
@@ -39,12 +68,24 @@ module.exports = React.createClass({
     this.setState({currentTab: 'logout'})
   },
   saveProfile: function () {
-    AuthActions.updateProfile({
-      name: this.state.userName,
-      email: this.state.email
+    this.setState({
+      isUpdatingProfile: true,
+      isUpdatingProfileDone: false,
+      isUpdatingProfileFailed: false
+    }, function () {
+      AuthActions.updateProfile({
+        profileName: this.state.profileName,
+        name: this.state.userName,
+        email: this.state.email
+      })
     })
   },
   savePassword: function () {
+    this.setState({
+      isChangingPassword: true,
+      isChangingPasswordDone: false,
+      isChangingPasswordFailed: false
+    })
     if (this.state.newPassword === this.state.confirmation) {
       request
         .put(apiUrl + 'auth/password')
@@ -56,21 +97,65 @@ module.exports = React.createClass({
           newPassword: this.state.newPassword
         })
         .end(function (err, res) {
+          if (err) {
+            console.error(err)
+            this.setState({
+              currentPassword: '',
+              newPassword: '',
+              confirmation: '',
+              isChangingPassword: false,
+              isChangingPasswordDone: false,
+              isChangingPasswordFailed: true
+            })
+            return
+          }
+
           this.setState({
             currentPassword: '',
             newPassword: '',
-            confirmation: ''
+            confirmation: '',
+            isChangingPassword: false,
+            isChangingPasswordDone: true,
+            isChangingPasswordFailed: false
           })
-          if (err) {
-            console.error(err)
-            return
-          }
 
         }.bind(this))
     }
   },
   sendEmail: function () {
-
+    this.setState({
+      isSending: true,
+      isSendingDone: false,
+      isSendingFailed: false
+    }, function () {
+      request
+        .post(apiUrl + 'mail')
+        .set({
+          Authorization: 'Bearer ' + localStorage.getItem('token')
+        })
+        .send({
+          title: this.state.contactTitle,
+          content: this.state.contactContent
+        })
+        .end(function (err, res) {
+          if (err) {
+            console.error(err)
+            this.setState({
+              isSending: false,
+              isSendingDone: false,
+              isSendingFailed: true
+            })
+            return
+          }
+          this.setState({
+            isSending: false,
+            isSendingDone: true,
+            isSendingFailed: false,
+            contactTitle: '',
+            contactContent: ''
+          })
+        }.bind(this))
+    })
   },
   logOut: function () {
     AuthActions.logout()
@@ -84,6 +169,10 @@ module.exports = React.createClass({
       content = (
         <div className='profile'>
           <div className='profileTop'>
+            <div className='profileFormRow'>
+              <label>Profile Name</label>
+              <input valueLink={this.linkState('profileName')} className='block-input' type='text' placeholder='Name'/>
+            </div>
             <div className='profileFormRow'>
               <label>Name</label>
               <input valueLink={this.linkState('userName')} className='block-input' type='text' placeholder='Name'/>
@@ -94,6 +183,9 @@ module.exports = React.createClass({
             </div>
             <div className='profileFormRow'>
               <button onClick={this.saveProfile} className='saveButton btn-primary'>Save</button>
+              <p className={'alertInfo' + (this.state.isUpdatingProfile ? '' : ' hide')}>Updating profile...</p>
+              <p className={'alertSuccess' + (this.state.isUpdatingProfileDone ? '' : ' hide')}>Successfully updated</p>
+              <p className={'alertError' + (this.state.isUpdatingProfileFailed ? '' : ' hide')}>An Error occurred</p>
             </div>
           </div>
 
@@ -112,6 +204,9 @@ module.exports = React.createClass({
             </div>
             <div className='profileFormRow'>
               <button onClick={this.savePassword} className='saveButton btn-primary'>Save</button>
+              <p className={'alertInfo' + (this.state.isChangingPassword ? '' : ' hide')}>Changing password...</p>
+              <p className={'alertSuccess' + (this.state.isChangingPasswordDone ? '' : ' hide')}>Successfully changed</p>
+              <p className={'alertError' + (this.state.isChangingPasswordFailed ? '' : ' hide')}>An Error occurred</p>
             </div>
           </div>
         </div>
@@ -126,7 +221,10 @@ module.exports = React.createClass({
           <input valueLink={this.linkState('contactTitle')} className='block-input' type='text' placeholder='title'/>
           <textarea valueLink={this.linkState('contactContent')} className='block-input' placeholder='message content'/>
           <div className='contactFormRow'>
-            <button onClick={this.sendEmail} className='saveButton btn-primary'>Send</button>
+            <button disabled={this.state.isSending} onClick={this.sendEmail} className='saveButton btn-primary'>Send</button>
+            <p className={'alertInfo' + (this.state.isSending ? '' : ' hide')}>Sending...</p>
+            <p className={'alertSuccess' + (this.state.isSendingDone ? '' : ' hide')}>Successfully sent</p>
+            <p className={'alertError' + (this.state.isSendingFailed ? '' : ' hide')}>An Error occurred</p>
           </div>
         </div>
       )
diff --git a/browser/main/Components/UserNavigator.jsx b/browser/main/Components/UserNavigator.jsx
index 1daa5fa4..1d01de14 100644
--- a/browser/main/Components/UserNavigator.jsx
+++ b/browser/main/Components/UserNavigator.jsx
@@ -48,8 +48,8 @@ module.exports = React.createClass({
       if (planet != null) {
         this.transitionTo('planet', {userName: planet.userName, planetName: planet.name})
       }
+      e.preventDefault()
     }
-    e.preventDefault()
   },
   render: function () {
     var planets = this.props.currentUser.Planets.map(function (planet, index) {
diff --git a/browser/main/Containers/UserContainer.jsx b/browser/main/Containers/UserContainer.jsx
index 31cf167f..732072c2 100644
--- a/browser/main/Containers/UserContainer.jsx
+++ b/browser/main/Containers/UserContainer.jsx
@@ -56,7 +56,7 @@ module.exports = React.createClass({
       }.bind(this))
   },
   onListen: function (res) {
-    if (res.status == null) return
+    if (res == null || res.status == null) return
 
     if (res.status === 'planetCreated') {
       var currentUser = this.state.currentUser
diff --git a/browser/main/Stores/AuthStore.js b/browser/main/Stores/AuthStore.js
index b14d856d..a7f0780c 100644
--- a/browser/main/Stores/AuthStore.js
+++ b/browser/main/Stores/AuthStore.js
@@ -76,7 +76,10 @@ var AuthStore = Reflux.createStore({
         .end(function (err, res) {
           if (err) {
             console.error(err)
-            this.trigger(null)
+            this.trigger({
+              status: 'userProfileUpdatingFailed',
+              data: err
+            })
             return
           }
 
diff --git a/browser/styles/shared/modal.styl b/browser/styles/shared/modal.styl
index 947ac119..726fc37e 100644
--- a/browser/styles/shared/modal.styl
+++ b/browser/styles/shared/modal.styl
@@ -167,6 +167,26 @@
           input
             float left
             width 250px
+          .alertSuccess, .alertError, .alertInfo
+            float right
+            line-height 44px
+            border-radius 5px
+            transition 0.1s
+            overflow hidden
+            white-space nowrap
+            width 200px
+            text-align center
+            &.hide
+              width 0
+          .alertSuccess
+            background-color successBackgroundColor
+            color successTextColor
+          .alertError
+            background-color errorBackgroundColor
+            color errorTextColor
+          .alertInfo
+            background-color infoBackgroundColor
+            color infoTextColor
           .saveButton
             float right
       .contact
@@ -185,6 +205,26 @@
           clearfix()
           .saveButton
             float right
+          .alertSuccess, .alertError, .alertInfo
+            float right
+            line-height 44px
+            border-radius 5px
+            transition 0.1s
+            overflow hidden
+            white-space nowrap
+            width 200px
+            text-align center
+            &.hide
+              width 0
+          .alertSuccess
+            background-color successBackgroundColor
+            color successTextColor
+          .alertError
+            background-color errorBackgroundColor
+            color errorTextColor
+          .alertInfo
+            background-color infoBackgroundColor
+            color infoTextColor
       .info
         text-align left
         .infoLabel
diff --git a/browser/styles/vars.styl b/browser/styles/vars.styl
index 813b5199..8a9af728 100644
--- a/browser/styles/vars.styl
+++ b/browser/styles/vars.styl
@@ -38,3 +38,10 @@ tableEvenBgColor = white
 
 facebookColor= #3b5998
 githubBtn= #201F1F
+
+successBackgroundColor= #E0F0D9
+successTextColor= #3E753F
+errorBackgroundColor= #F2DEDE
+errorTextColor= #A64444
+infoBackgroundColor= #D9EDF7
+infoTextColor= #34708E