diff --git a/app/models/invoice.rb b/app/models/invoice.rb
index 2e77c8b4a..eaf1d8961 100644
--- a/app/models/invoice.rb
+++ b/app/models/invoice.rb
@@ -120,7 +120,6 @@ def deposit
 
   def recalculate_vat_rate
     return unless payable?
-    return if billing_profile_id == billing_profile_id_was
 
     self.vat_rate = assign_vat_rate
 
diff --git a/app/models/phone_confirmation.rb b/app/models/phone_confirmation.rb
index 972b1a8cc..366f61574 100644
--- a/app/models/phone_confirmation.rb
+++ b/app/models/phone_confirmation.rb
@@ -3,7 +3,7 @@
 class PhoneConfirmation
   attr_reader :user
 
-  TIME_LIMIT = AuctionCenter::Application.config.customization[:mobile_sms_sent_time_limit_in_minutes] || 1.minutes
+  TIME_LIMIT = AuctionCenter::Application.config.customization[:mobile_sms_sent_time_limit_in_minutes].to_i.minutes || 1.minutes
 
   def initialize(user)
     @user = user
diff --git a/app/views/phone_confirmations/new.html.erb b/app/views/phone_confirmations/new.html.erb
index 86314323b..0654e6e1c 100644
--- a/app/views/phone_confirmations/new.html.erb
+++ b/app/views/phone_confirmations/new.html.erb
@@ -5,7 +5,7 @@
 <% end %>
 
 <div class="u-container" data-controller='timeleft'
-                         data-timeleft-date-value="<%= I18n.l(current_user.mobile_phone_confirmed_sms_send_at + PhoneConfirmation::TIME_LIMIT) %>"
+                         data-timeleft-date-value="<%= current_user.mobile_phone_confirmed_sms_send_at.present? ? I18n.l(current_user.mobile_phone_confirmed_sms_send_at + PhoneConfirmation::TIME_LIMIT) : I18n.l(Time.zone.now) %>"
                          data-timeleft-refresh-interval-value="500" data-timeleft-message-timer-value="<%= I18n.t('phone_confirmations.new.send_again') %>" 
                          data-timeleft-default-message-timer-value="<%= I18n.t('phone_confirmations.new.send_code') %>">
     <div class="u-container margin-block">