diff --git a/app/models/user.rb b/app/models/user.rb
index f524b6b4..58b20fca 100755
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -264,7 +264,7 @@ def orcid
   end
 
   def orcid_as_url
-    Rails.env.test? ? ENV["ORCID_URL"] + "/" + orcid : "https://orcid.org/" + orcid
+    ENV["ORCID_URL"] ? ENV["ORCID_URL"] + "/" + orcid : "https://orcid.org/" + orcid
   end
 
   def flipper_id
diff --git a/app/views/settings/_show.html.erb b/app/views/settings/_show.html.erb
index f7cf5569..53591ef6 100644
--- a/app/views/settings/_show.html.erb
+++ b/app/views/settings/_show.html.erb
@@ -2,7 +2,7 @@
   <div class="col-md-9">
     <div class="panel-body settings-container">
       <h2 class="settings-name col-span-full"><%= @user.name %></h2>
-      <p class="settings-orcid-link col-span-full"><%= link_to @user.orcid_as_url, @user.orcid %></p>
+      <%= link_to @user.orcid_as_url, @user.orcid_as_url, class: "settings-orcid-link col-span-full" %>
 
       <h3 class="settings-section-header col-span-full">Link Works to ORCID
         <% if @user.orcid_search_and_link_access_token %>