diff --git a/app/models/user.rb b/app/models/user.rb
index f8348a1455..3bc0075ab5 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1845,6 +1845,14 @@ TRIGGER
     self.database_schema
   end
 
+  # return public user url -> string
+  def public_url
+    subdomain = organization.nil? ? username : organization.name
+    user_name = organization.nil? ? nil : username
+
+    CartoDB.base_url(subdomain, user_name)
+  end
+
   private
 
   def name_exists_in_organizations?
diff --git a/app/views/admin/visualizations/embed_map.html.erb b/app/views/admin/visualizations/embed_map.html.erb
index 13688ee149..2f5266364d 100644
--- a/app/views/admin/visualizations/embed_map.html.erb
+++ b/app/views/admin/visualizations/embed_map.html.erb
@@ -17,9 +17,14 @@
 
     <style type="text/css">
       html, body, #map {height: 100%; padding: 0; margin: 0;}
+      /* footer */
       .cartodb-text {position:absolute; display:none; bottom:0; left:0; right:0; margin:0; padding:0 10px; background:white; font:normal 11px "Helvetica",Arial; color:#999999; border-top:1px solid #CCC; border-top:1px solid rgba(0,0,0,0); box-shadow:rgba(0,0,0,0.6) 0 0 1px 0; -webkit-box-shadow:rgba(0,0,0,0.6) 0 0 1px 0; -moz-box-shadow:rgba(0,0,0,0.6) 0 0 1px 0; -o-box-shadow:rgba(0,0,0,0.6) 0 0 1px 0; line-height:29px; z-index:2; }
       .cartodb-text a {color:#397DB8; text-decoration:underline;}
+      .cartodb-text a.user { text-decoration:none }
+      .cartodb-text img {display:inline-block; *display:inline; vertical-align:middle; border-radius:16px; -webkit-border-radius:16px; -moz-border-radius:16px; zoom:1; text-decoration:none }
+      .cartodb-text span.username { text-decoration:underline }
 
+      /* not supported dialog */ 
       #not_supported_dialog {position:absolute; width:356px; height:213px; top:50%; left:50%; margin-top:-107px; margin-left:-178px; padding:0; background-color:#FFF; text-align:center; font-family:'Helvetica', Arial; color:#666666; z-index:10000;}
       #not_supported_dialog h2 {display:inline-block; width:77px; margin:30px 0 0; padding-bottom:16px; font-size:13px; font-weight:bold; border-bottom:1px solid #D9D9D9; vertical-align:top; zoom:1; *display:inline;}
       #not_supported_dialog p {display:block; padding:0 40px; margin:12px 0 0; font-size:15px;}
@@ -71,7 +76,13 @@
           <li class="last"><a href="http://www.mozilla.org/en-US/firefox/all/‎" class="firefox">Firefox</a></li>
         </ul>
       </div>
-      <div class="cartodb-text">Create your own custom maps with <a href="http://cartodb.com?utm_source=Footer_Link&utm_medium=referral&utm_campaign=Embed_v1&utm_content=CartoDB&utm_term=<%= @visualization.user.username %>" target="_blank">CartoDB</a></div>
+      <div class="cartodb-text">
+        Map created by
+        <a class="user" href="<%= @visualization.user.public_url %>?utm_source=Footer_Link&utm_medium=referral&utm_campaign=Embed_v1&utm_content=<%= @visualization.user.username %>" target="_blank">
+          <img src="<%= @visualization.user.avatar_url %>" width="16" height="16" alt="<%= @visualization.user.username %>" title="<%= @visualization.user.username %>" />
+          <span class="username"><%= @visualization.user.username %></span>
+        </a>
+      </div>
     <% end %>
 
     <% if @visualization.map.provider == 'googlemaps' %>
diff --git a/app/views/admin/visualizations/public_map.html.erb b/app/views/admin/visualizations/public_map.html.erb
index 9f4f3b3e7a..51705fbea3 100644
--- a/app/views/admin/visualizations/public_map.html.erb
+++ b/app/views/admin/visualizations/public_map.html.erb
@@ -24,8 +24,6 @@
       <link rel="stylesheet" href="//cartodb-libs.global.ssl.fastly.net/cartodb.js/v3/themes/css/cartodb.css" />
     <% end %>
 
-    <style type="text/css">div.cartodb-logo { display:none!important }</style>
-
     <%= insert_trackjs() %>
 
     <!--[if lt IE 9]>
@@ -254,7 +252,7 @@
             'description':  bool_fn,
             'shareable':    bool_fn,
             'fullscreen':   bool_fn,
-            'cartodb_logo': false,
+            'cartodb_logo': bool_fn,
             'scrollwheel':  bool_fn,
             'sublayer_options': layer_fn,
             'layer_selector': bool_fn,
@@ -275,8 +273,8 @@
 
           var scrollwheelEnabled = opt.scrollwheel;
 
-          // opt.title       = false;
-          // opt.description = false;
+          // Logo MUST be hidden in this view
+          opt.cartodb_logo = false;
           opt.scrollwheel = false; 
 
           cartodb.config.set({