diff --git a/app/views/aspects/index.html.haml b/app/views/aspects/index.html.haml
index f1949cf81..b5171e8f5 100644
--- a/app/views/aspects/index.html.haml
+++ b/app/views/aspects/index.html.haml
@@ -88,20 +88,6 @@
       %h5
         Donate
     .content
-      Keep JoinDiaspora running fast, buy our servers coffee
-      = form_tag "https://www.paypal.com/cgi-bin/webscr", :method => 'post' do
-        = hidden_field_tag "cmd", "_s-xclick"
-
-        = hidden_field_tag "hosted_button_id", "WPG875V39Y9RA"
-        = hidden_field_tag "on0", "Type"
-        = hidden_field_tag "modify" , "2"
-
-        What monthly amount
-        %br
-
-        = select_tag :os0, options_from_collection_for_select(["Caffee mocha : $3.00USD", "Caffee Americano : $5.00USD", "Box of Joe : $20.00USD"], "to_s", "to_s")
-        = hidden_field_tag "currency_code", "USD"
-        = submit_tag "Coffee!!"
-        / "https://www.paypalobjects.com/en_US/i/btn/btn_buynow_SM.gif"
-/<img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">= hidden_field_tag "cmd", "_s-xclick"
-
+      Keep JoinDiaspora.com running fast, buy our servers their monthly coffee fix!
+      %br
+      = render 'shared/donate'
diff --git a/app/views/shared/_donate.html b/app/views/shared/_donate.html
new file mode 100644
index 000000000..1ede3255d
--- /dev/null
+++ b/app/views/shared/_donate.html
@@ -0,0 +1,15 @@
+
+<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+<input type="hidden" name="cmd" value="_s-xclick">
+<input type="hidden" name="hosted_button_id" value="WPG875V39Y9RA">
+<input type="hidden" name="on0" value="Type">
+<input type="hidden" name="modify" value="2">
+<select name="os0">
+	<option value="Mocha">Mocha : $3.00USD</option>
+	<option value="Americano">Americano : $5.00USD</option>
+	<option value="Box o' Joe">Box o' Joe : $20.00USD</option>
+</select>
+<input type="hidden" name="currency_code" value="USD">
+<input type="submit" name="submit" value="Donate">
+</form>
+