Fixed not rendering org avatar: improvements

app/helpers/login_helper.rb

@@ -24,7 +24,12 @@ module LoginHelper
   end
 
   def login_org_avatar
-    @organization && @organization.name != "team" && !@organization.avatar_url.blank?
+    if @organization && @organization.name != "team" && !@organization.avatar_url.blank?
+      @organization.avatar_url = @organization.avatar_url.sub(/^https?\:/, '')
+      return true
+    else
+      return false
+    end
   end
 
   def forget_password_url

app/views/admin/shared/_sessions_header.html.erb

@@ -5,7 +5,7 @@
         <div class="Navbar-title">
           <picture class="Navbar-brand">
             <% if login_org_avatar %>
-              <img src="<%= @organization.avatar_url.sub(/^https?\:/, '') %>" alt="<%= @organization.name %>" height="48" />
+              <img src="<%= @organization.avatar_url %>" alt="<%= @organization.name %>" height="48" />
             <% else %>
               <source type="image/svg+xml" srcset="<%= image_path "layout/sessions/brand.svg" %>">
               <img src="<%= image_path "layout/sessions/brand.png" %>" alt="CartoDB" height="48" width="48" />