diff --git a/imports/ui/components/Feedback/Feedback.js b/imports/ui/components/Feedback/Feedback.js
index 43277e1..c6b8919 100644
--- a/imports/ui/components/Feedback/Feedback.js
+++ b/imports/ui/components/Feedback/Feedback.js
@@ -82,8 +82,8 @@ class Feedback extends Component {
                   className="form-control"
                   ref={email => (this.email = email)}
                   placeholder={this.t('Tu correo')}
-                  disabled={this.props.authenticated}
-                  defaultValue={this.props.authenticated ? Meteor.user().emails[0].address : ''}
+                  disabled={this.props.emailVerified}
+                  defaultValue={this.props.emailVerified ? this.props.emailAddress : ''}
                   type="email"
               />
             </FormGroup>
@@ -117,9 +117,10 @@ class Feedback extends Component {
 
 Feedback.propTypes = {
   t: PropTypes.func.isRequired,
-  authenticated: PropTypes.bool.isRequired
+  emailAddress: PropTypes.string,
+  emailVerified: PropTypes.bool.isRequired
 };
-
-export default translate([], { wait: true })(withTracker(() => ({
-  authenticated: !!Meteor.userId()
+export default translate([], { wait: true })(withTracker(props => ({
+  emailAddress: props.emailAddress,
+  emailVerified: props.emailVerified
 }))(Feedback));
diff --git a/imports/ui/layouts/App/App.js b/imports/ui/layouts/App/App.js
index 89d427e..4089c65 100644
--- a/imports/ui/layouts/App/App.js
+++ b/imports/ui/layouts/App/App.js
@@ -140,8 +140,8 @@ const App = props => (
               </Switch>
             </Grid>
             <Footer />
-            { !isHome() && <Feedback /> }
-            <Reconnect />
+            { Meteor.isDevelopment && !props.isHome && <Feedback {...props} /> }
+            <Reconnect {...props} />
             {props.i18nReady.get() &&
             <Blaze template="cookieConsent" />
             }
@@ -162,7 +162,8 @@ App.propTypes = {
   i18nReady: PropTypes.object.isRequired,
   userId: PropTypes.string,
   emailAddress: PropTypes.string,
-  emailVerified: PropTypes.bool.isRequired
+  emailVerified: PropTypes.bool.isRequired,
+  isHome: PropTypes.bool.isRequired
 };
 
 const getUserName = name => ({
@@ -178,6 +179,7 @@ export default withTracker(() => {
   const name = user && user.profile && user.profile.name && getUserName(user.profile.name);
   const emailAddress = user && user.emails && user.emails[0].address;
   // console.log(`i18n ready?: ${i18nReady.get()}`);
+  console.log(`isHome?: ${isHome()}`);
   return {
     loading,
     loggingIn,
@@ -187,6 +189,7 @@ export default withTracker(() => {
     roles: !loading && Roles.getRolesForUser(userId),
     userId,
     emailAddress,
+    isHome: isHome(),
     emailVerified: user && user.emails ? user && user.emails && user.emails[0].verified : true
   };
 })(App);