diff --git a/docker-compose.yml b/docker-compose.yml
index 3c6e24a3a..38b05b8d4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -70,7 +70,7 @@ services:
       /bin/sh -c "
       set -x
       while ! nc -z minio 9000; echo 'Waiting for minio to startup...' && sleep 0.1; sleep 3;
-      /usr/bin/mc config host add minio_docker http://minio:$MINIO_PORT $MINIO_ACCESS_KEY $MINIO_SECRET_KEY;
+      until (/usr/bin/mc config host add minio_docker http://minio:$MINIO_PORT $MINIO_ACCESS_KEY $MINIO_SECRET_KEY) do echo '...waiting...' && sleep 1; done;
       /usr/bin/mc mb minio_docker/$AWS_STORAGE_BUCKET_NAME;
       /usr/bin/mc mb minio_docker/$AWS_STORAGE_PRIVATE_BUCKET_NAME;
       /usr/bin/mc policy set download minio_docker/$AWS_STORAGE_BUCKET_NAME;
diff --git a/src/apps/profiles/views.py b/src/apps/profiles/views.py
index 93687968f..50e5cf66a 100644
--- a/src/apps/profiles/views.py
+++ b/src/apps/profiles/views.py
@@ -79,8 +79,7 @@ def activate(request, uidb64, token):
         messages.success(request, f'Your account is fully setup! Please login.')
         return redirect('accounts:login')
     else:
-        user.delete()
-        messages.error(request, f"Activation link is invalid. Please sign up again.")
+        messages.error(request, f"Activation link is invalid. Please double check your link.")
         return redirect('accounts:signup')
     return redirect('pages:home')
 
diff --git a/src/templates/registration/login.html b/src/templates/registration/login.html
index 1f147ae29..4ffd5fcb3 100644
--- a/src/templates/registration/login.html
+++ b/src/templates/registration/login.html
@@ -9,14 +9,6 @@ <h2 class="ui blue centered header">
     <div class="ui stacked segment">
         <form class="ui form" method="POST">
             {% csrf_token %}
-
-            <div class="field">
-                <a class="ui fluid basic button" href="{% url 'social:begin' 'chahub' %}">Log in with ChaHub</a>
-            </div>
-            <div class="ui horizontal divider form-divider-line">
-                <span class="form-divider-words">or</span>
-            </div>
-
             {% if form.non_field_errors %}
             <div class="ui red message">
                 {{ form.non_field_errors }}
diff --git a/src/templates/registration/signup.html b/src/templates/registration/signup.html
index 0d2db6c28..f5d5ca78b 100644
--- a/src/templates/registration/signup.html
+++ b/src/templates/registration/signup.html
@@ -14,17 +14,6 @@ <h2 class="ui blue centered header">
     <div class="ui stacked segment">
         <form class="ui form" method="post">
             {% csrf_token %}
-
-            <div class="field">
-                <a class="ui fluid button" href="{% url 'social:begin' 'chahub' %}">Sign up with ChaHub</a>
-            </div>
-            <div class="field">
-                <a class="ui fluid basic button" href="{{ chahub_signup_url }}" target="_blank">Create a ChaHub
-                    Account</a>
-            </div>
-            <div class="ui horizontal divider form-divider-line">
-                <span class="form-divider-words">Or</span>
-            </div>
             <div class="field">
                 <div class="ui left icon input">
                     <i class="user icon"></i>