diff --git a/ennstatus/donate/views.py b/ennstatus/donate/views.py
--- a/ennstatus/donate/views.py
+++ b/ennstatus/donate/views.py
@@ -13,7 +13,7 @@ donate_page = Blueprint('donate', __name
 @donate_page.route('/', methods=('GET', 'POST'))
 def index():
 
-    current_app.logger.info('Handling snailmail')
+    current_app.logger.info('Handling index')
     form = BPMForm()
     country_choices = [choice[0] for choice in form.country.choices]
 
@@ -21,7 +21,7 @@ def index():
         current_app.logger.debug('Validating form')
         if form.validate_on_submit():
             country = form.country.data
-            return redirect(url_for('donate.snailmail', country=country))
+            return redirect(url_for('donate.index', country=country))
     else:
         if 'country' in request.args:
             country = request.args['country']
diff --git a/ennstatus/templates/donate/index.html b/ennstatus/templates/donate/index.html
--- a/ennstatus/templates/donate/index.html
+++ b/ennstatus/templates/donate/index.html
@@ -63,16 +63,26 @@
           <h3>SnailMail</h3>
         </center>
         <div class="well well-sm">
+          <div class="pull-right">
+            <form class="form-inline" role="form" method="POST" action"{{ url_for('donate.index') }}">
+              {{ form.hidden_tag() }}
+              <div class="form-group">
+                {{ form.country(_class="form-class") }}
+              </div>
+              <input type="submit" class="btn btn-primary btn-sm" value="Submit">
+            </form>
+          </div>
+          <div class="clearfix"></div>
           <address>
             <strong>Frënn vun der Ënn, ASBL</strong><br>
                     BPM 381892<br>
-                    34, Rue Gabriel Lippmann<br>
-                    L-5365, Munsbach<br>
-                    Luxembourg
+                    {{ address['address'] }}<br>
+                    {{ address['postal_code'] }}, {{ address['city'] }}<br>
+                    {{ address['country'] }}
           </address>
         </div>
       </div>
-      <div class="thumbnail">
+      <div>
         <center>
           <h3>Bitcoin</h3>
         </center>