diff --git a/ghost/portal/src/components/ParentContainer.js b/ghost/portal/src/components/ParentContainer.js
index 938b533e6a..8371fcabc2 100644
--- a/ghost/portal/src/components/ParentContainer.js
+++ b/ghost/portal/src/components/ParentContainer.js
@@ -203,10 +203,20 @@ export default class ParentContainer extends React.Component {
                     });
                 }
             }
+            setTimeout(() => {
+                this.setState({
+                    action: ''
+                });
+            }, 5000);
         } catch (e) {
             this.setState({
                 action: `${action}:failed`
             });
+            setTimeout(() => {
+                this.setState({
+                    action: ''
+                });
+            }, 5000);
         }
     }
 
diff --git a/ghost/portal/src/components/pages/AccountProfilePage.js b/ghost/portal/src/components/pages/AccountProfilePage.js
index 35ca815886..40eebf1d60 100644
--- a/ghost/portal/src/components/pages/AccountProfilePage.js
+++ b/ghost/portal/src/components/pages/AccountProfilePage.js
@@ -38,7 +38,13 @@ export default class AccountProfilePage extends React.Component {
 
     renderSaveButton() {
         const isRunning = (this.context.action === 'updateMember:running');
-        const label = isRunning ? 'Saving' : 'Save';
+        const isSaved = (this.context.action === 'updateMember:success');
+        let label = 'Save';
+        if (isRunning) {
+            label = 'Saving';
+        } else if (isSaved) {
+            label = 'Saved';
+        }
         const disabled = isRunning ? true : false;
         return (
             <ActionButton