diff --git a/services/registration/swap_limit.vis b/services/registration/swap_limit.vis
index fe116ce..b96f1f5 100644
--- a/services/registration/swap_limit.vis
+++ b/services/registration/swap_limit.vis
@@ -1,5 +1,4 @@
-LOAD swap_max_limit 0
-CATCH _ flag_incorrect_voucher 1
+RELOAD swap_max_limit
 MAP swap_max_limit
 MOUT back 0
 HALT
diff --git a/services/registration/swap_to_list.vis b/services/registration/swap_to_list.vis
index e420a69..de1836e 100644
--- a/services/registration/swap_to_list.vis
+++ b/services/registration/swap_to_list.vis
@@ -3,5 +3,9 @@ CATCH _ flag_incorrect_voucher 1
 MAP swap_to_list
 MOUT back 0
 HALT
+LOAD swap_max_limit 64
+RELOAD swap_max_limit
+CATCH . flag_incorrect_voucher 1
+CATCH low_swap_amount flag_low_swap_amount 1
 INCMP _ 0
 INCMP swap_limit *