diff --git a/app/models/user.rb b/app/models/user.rb
index 585a608..9b373e1 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -10,7 +10,7 @@ class User < ApplicationRecord
 
   before_validation :set_default_username, on: :create
   after_save :generate_open_graph_image
-  after_save :download_and_store_avatar, if: :saved_change_to_avatar?
+  after_save :download_and_store_avatar
 
   serialize :tags, JSON
 
@@ -31,27 +31,27 @@ def generate_open_graph_image
   end
 
   def download_and_store_avatar
-    return unless avatar.present? && avatar.start_with?('http')
-
+    return if avatar.blank? || !avatar.start_with?('http')
+  
     require 'open-uri'
     require 'fileutils'
-
+  
     begin
       avatar_dir = Rails.root.join('public', 'avatars')
       FileUtils.mkdir_p(avatar_dir) unless File.directory?(avatar_dir)
-
+  
       file = URI.open(avatar)
-
-      filename = "avatar_#{id}_#{Time.now.to_i}#{File.extname(avatar)}"
+  
+      filename = "#{username}_avatar#{File.extname(avatar)}"
       filepath = File.join(avatar_dir, filename)
-
+  
       File.open(filepath, 'wb') do |local_file|
         local_file.write(file.read)
       end
-
-      update_column(:avatar, "/avatars/#{filename}")
-    rescue OpenURI::HTTPError, SocketError => e
-      Rails.logger.error "Failed to download avatar for user #{id}: #{e.message}"
+  
+      Rails.logger.info "Avatar downloaded for user #{username}"
+    rescue StandardError => e
+      Rails.logger.error "Failed to download avatar for user #{username}: #{e.message}"
     end
   end
 
diff --git a/app/views/links/user_links.html.erb b/app/views/links/user_links.html.erb
index b7273a1..4ab2761 100644
--- a/app/views/links/user_links.html.erb
+++ b/app/views/links/user_links.html.erb
@@ -3,10 +3,12 @@
 <div class="profile-header max-w-4xl mx-auto px-4 text-center">
   <div class="avatar-container flex flex-col items-center">
     <div class="avatar">
-      <% if @user.avatar.present? %>
+      <% local_avatar_path = "/avatars/#{@user.username}_avatar#{File.extname(@user.avatar)}" %>
+      <% if File.exist?(Rails.root.join('public' + local_avatar_path)) %>
+        <%= image_tag local_avatar_path, alt: @user.email, class: "rounded-full border-4 border-white object-cover", style: "width: 8rem; height: auto;" %>
+      <% elsif @user.avatar.present? %>
         <%= image_tag @user.avatar, alt: @user.email, class: "rounded-full border-4 border-white object-cover", style: "width: 8rem; height: auto;" %>
       <% else %>
-        <!-- Provide a default avatar image or placeholder -->
         <%= image_tag "greg.jpg", alt: @user.email, class: "rounded-full border-4 border-white object-cover", style: "width: 8rem; height: auto;" %>
       <% end %>
     </div>
diff --git a/public/avatars/.keep b/public/avatars/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/public/avatars/avatar_1_1723378561.jpg b/public/avatars/loftwah_avatar.jpg
similarity index 100%
rename from public/avatars/avatar_1_1723378561.jpg
rename to public/avatars/loftwah_avatar.jpg
diff --git a/public/uploads/og_images/loftwah_og.png b/public/uploads/og_images/loftwah_og.png
index 7c6f6bf..874d6f5 100644
Binary files a/public/uploads/og_images/loftwah_og.png and b/public/uploads/og_images/loftwah_og.png differ