                             <legend>Buddylist</legend>
                             <cfif request.isLoggedIn OR attributes.moduleData.userData.showBuddies()>
                                 <cfset buddyList = attributes.moduleData.userData.getBuddylist()>
-                                <cfif buddyList.len() EQ 0>
+                                <cfif buddyList.len() GT 0>
+                                    <cfloop from="1" to="#arrayLen(buddyList)#" index="i">
+                                        <a href="/User/#buddyList[i].userName#">#buddyList[i].userName#</a>
+                                    </cfloop>
+                                <cfelse>
                                     <div class="alert alert-info">
                                         Der User hat keine Buddies.<br>
                                         Helf Ihm dagegen anzukommen und stelle einen Buddyrequest!
-                                        <cfif request.isLoggedIn>
-                                            <button type="button" class="btn btn-success">Werde mein Buddy!</button>
+                                        <cfif request.isLoggedIn AND 
+                                              NOT request.actualUser.isMyBuddy(attributes.moduleData.userData.getUsername())>
+                                            <a class="btn btn-success" href="#request.sesLink#?addBuddy">Werde mein Buddy!</a>
                                         </cfif>
                                     </div>
-                                <cfelse>
-                                    <cfloop from="1" to="#arrayLen(buddyList)#" index="i">
-                                        <a href="/User/#buddyList[i].userName#">#buddyList[i].userName#</a>
-                                    </cfloop>
                                 </cfif>
                             <cfelse>
                                 <div class="alert alert-danger">Bitte loggen Sie sich ein um diesen Bereich zu sehen!</div>

                            <label class="col-lg-3 control-label">Github</label>
                            <div class="col-lg-9">
                                <cfif attributes.moduleData.isMyUser>
                                    <input class="form-control" name="github" value="#attributes.moduleData.userData.getGithubLink()#">
                                <cfelse>
                                    <cfif attributes.moduleData.userData.getGithubLink() NEQ "">
                                        <p class="form-control-static"><a href="http://www.github.com/#attributes.moduleData.userData.getGithubLink()#">#attributes.moduleData.userData.getUsername()# auf Github <i class="glyphicon glyphicon-link"></i></a></p>

        </div>
        <div class="col-md-6">
            <section class="widget">
                <form id="userData" class="form-horizontal" role="form" <cfif attributes.moduleData.isMyUser>action="#request.sesLink#" method="post"</cfif>
                    <fieldset>
                        <legend>Allgemeine Infos</legend>
                        <div class="form-group">
