diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index c234968c2a06679af775c7f5db52ee3e47b76f45..0acd1311ea2ad0b0fcb76724cf770850fcffaccc 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -53,6 +53,7 @@ module ApplicationHelper
   def masked_string(string)
     string = string.to_s # in case it was nil
     mask_length = [(string.length - 5), 0].max
+    mask_length = 30 if mask_length > 30
     string.to_s.gsub(/.+(?=.{5})/, '•' * mask_length)
   end
 
diff --git a/app/views/admin/communication/websites/_form.html.erb b/app/views/admin/communication/websites/_form.html.erb
index b74c842aa0e5f636049824ec343c3cc9434489ba..ab0b5b565de558f4836dd6551adfac19f34c7470 100644
--- a/app/views/admin/communication/websites/_form.html.erb
+++ b/app/views/admin/communication/websites/_form.html.erb
@@ -25,6 +25,8 @@
               <%= f.input :access_token, 
                           as: :password, 
                           placeholder: masked_string(f.object.access_token), 
+                          autocomplete: 'off',
+                          role: 'presentation',
                           hint: t("simple_form.hints.communication_website.access_token_#{f.object.access_token.blank? ? 'without' : 'with'}_existing").html_safe
                           %>
               <%= f.input :repository %>