diff --git a/calsocial/__init__.py b/calsocial/__init__.py
index 8af9ebf..a1f0b31 100644
--- a/calsocial/__init__.py
+++ b/calsocial/__init__.py
@@ -259,9 +259,9 @@ class CalendarSocialApp(Flask):
 
         from .models import Profile, User
 
-        profile = current_user.profile
-
-        if profile is None:
+        try:
+            profile = Profile.query.join(User).filter(User.username == username).one()
+        except NoResultFound:
             abort(404)
 
         return render_template('profile-details.html', profile=profile)
@@ -274,14 +274,14 @@ class CalendarSocialApp(Flask):
 
         from .models import db, Profile, User, UserFollow, Notification, NotificationAction
 
-        profile = current_user.profile
-
-        if profile is None:
+        try:
+            profile = Profile.query.join(User).filter(User.username == username).one()
+        except NoResultFound:
             abort(404)
 
         if profile.user != current_user:
-            follow = UserFollow(follower_id=current_user.profile,
-                                followed_id=profile,
+            follow = UserFollow(follower=current_user.profile,
+                                followed=profile,
                                 accepted_at=datetime.utcnow())
             db.session.add(follow)
 
diff --git a/calsocial/templates/profile-details.html b/calsocial/templates/profile-details.html
index 75db8d8..07ea66d 100644
--- a/calsocial/templates/profile-details.html
+++ b/calsocial/templates/profile-details.html
@@ -6,7 +6,7 @@
     <small>@{{ profile.user.username}}</small>
 </h1>
     {% if profile.user != current_user %}
-<a href="{{ url_for('follow_user', username=profile.user.username) }}">{% trans %}Follow{% endtrans %}
+<a href="{{ url_for('follow_user', username=profile.user.username) }}">{% trans %}Follow{% endtrans %}</a>
     {% endif %}
 
 <h2>