diff --git a/src/components/auth/PanelTransition.jsx b/src/components/auth/PanelTransition.jsx
index c98be2a..380e746 100644
--- a/src/components/auth/PanelTransition.jsx
+++ b/src/components/auth/PanelTransition.jsx
@@ -113,7 +113,7 @@ class PanelTransition extends Component {
 
         // a hack to disable height animation on first render
         const isHeightMeasured = this.isHeightMeasured;
-        this.isHeightMeasured = formHeight > 0;
+        this.isHeightMeasured = isHeightMeasured || formHeight > 0;
 
         return (
             <TransitionMotion
diff --git a/src/components/profile/changeEmail/ChangeEmail.jsx b/src/components/profile/changeEmail/ChangeEmail.jsx
index 0a32888..390dce8 100644
--- a/src/components/profile/changeEmail/ChangeEmail.jsx
+++ b/src/components/profile/changeEmail/ChangeEmail.jsx
@@ -108,7 +108,7 @@ export default class ChangeEmail extends Component {
 
         // a hack to disable height animation on first render
         const isHeightMeasured = this.isHeightMeasured;
-        this.isHeightMeasured = activeStepHeight > 0;
+        this.isHeightMeasured = isHeightMeasured || activeStepHeight > 0;
 
         return (
             <Motion