diff --git a/lambdainst/models.py b/lambdainst/models.py
index e8c5b27..6412ca8 100644
--- a/lambdainst/models.py
+++ b/lambdainst/models.py
@@ -99,7 +99,7 @@ setup_sync_hooks(User, VPNUser)
 
 @receiver(post_save, sender=User)
 def create_vpnuser(sender, instance, created, **kwargs):
-    if created:
+    if created and not instance.vpnuser:
         VPNUser.objects.create(user=instance)
 
 
diff --git a/lambdainst/views.py b/lambdainst/views.py
index 075a309..37e9b31 100644
--- a/lambdainst/views.py
+++ b/lambdainst/views.py
@@ -94,6 +94,7 @@ def signup(request):
         pass
 
     user.vpnuser.campaign = request.session.get('campaign')
+    user.vpnuser.add_paid_time(timedelta(days=7))
 
     if site_config.TRIAL_ON_SIGNUP:
         trial_time = timedelta(hours=site_config.TRIAL_ON_SIGNUP)
diff --git a/templates/lambdainst/account.html b/templates/lambdainst/account.html
index 1830e28..3bdf192 100644
--- a/templates/lambdainst/account.html
+++ b/templates/lambdainst/account.html
@@ -166,30 +166,10 @@
     </div>
     {% endif %}
 
-    {% if user.vpnuser.can_have_trial %}
-    <div class="content-box account-trial">
-        <p>
-            {% blocktrans trimmed with left=user.vpnuser. %}
-                For up to one week, you can activate your free trial for two hours by clicking on this button:
-            {% endblocktrans %}
-        </p>
-        <form action="/account/trial" method="post" class="pure-form" name="trial_form">
-            {% csrf_token %}
-            <div class="h-captcha" data-sitekey="{{ hcaptcha_site_key }}" data-callback="onCaptcha"></div>
-            <script src="https://hcaptcha.com/1/api.js" async defer></script>
-            <script>
-                function onCaptcha(v) {
-                    document.forms.trial_form.submit();
-                }
-            </script>
-        </form>
-    </div>
-    {% endif %}
-
     <div class="account-aff-box">
         <p>
             {% blocktrans trimmed %}
-            Get two weeks for free for every referral that takes at least one month!
+            Get two weeks for free for every referral that subscribes for any amount of time!
             {% endblocktrans %}
             {% trans 'Share this link' %}:
             <form class="pure-form">