diff --git a/lib/models/bitbucket.dart b/lib/models/bitbucket.dart
index 1379799..2811804 100644
--- a/lib/models/bitbucket.dart
+++ b/lib/models/bitbucket.dart
@@ -50,6 +50,7 @@ class BbRepo {
   String slug;
   BbRepoMainbranch mainbranch;
   Map<String, dynamic> links;
+  String get ownerLogin => fullName.split('/')[0]; // owner has no username
   String get avatarUrl => links['avatar']['href'];
   BbRepo();
   factory BbRepo.fromJson(Map<String, dynamic> json) => _$BbRepoFromJson(json);
diff --git a/lib/screens/bb_repo.dart b/lib/screens/bb_repo.dart
index c52ba50..e92789f 100644
--- a/lib/screens/bb_repo.dart
+++ b/lib/screens/bb_repo.dart
@@ -38,7 +38,7 @@ class BbRepoScreen extends StatelessWidget {
             RepoHeader(
               avatarUrl: p.avatarUrl,
               avatarLink: null,
-              owner: p.owner.displayName, // TODO:
+              owner: p.ownerLogin,
               name: p.slug,
               description: p.description,
               homepageUrl: p.website,
diff --git a/lib/screens/bb_user.dart b/lib/screens/bb_user.dart
index ac361db..70e0404 100644
--- a/lib/screens/bb_user.dart
+++ b/lib/screens/bb_user.dart
@@ -17,11 +17,11 @@ class BbUserScreen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final auth = Provider.of<AuthModel>(context);
+    final _login = login ?? auth.activeAccount.login;
     return RefreshStatefulScaffold<Tuple2<BbUser, Iterable<BbRepo>>>(
       title: Text(isViewer ? 'Me' : 'User'),
       fetchData: () async {
-        final auth = Provider.of<AuthModel>(context);
-        final _login = login ?? auth.activeAccount.login;
         final res = await Future.wait([
           auth.fetchBb('/users/$_login'),
           auth.fetchBbWithPage('/repositories/$_login'),
@@ -46,9 +46,9 @@ class BbUserScreen extends StatelessWidget {
         return Column(
           children: <Widget>[
             UserHeader(
-              login: user.displayName,
+              login: _login,
               avatarUrl: user.avatarUrl,
-              name: user.nickname,
+              name: user.displayName,
               createdAt: user.createdOn,
               bio: null,
             ),
diff --git a/lib/widgets/repository_item.dart b/lib/widgets/repository_item.dart
index a020dd6..e9bfe9a 100644
--- a/lib/widgets/repository_item.dart
+++ b/lib/widgets/repository_item.dart
@@ -42,7 +42,7 @@ class RepositoryItem extends StatelessWidget {
     @required BbRepo payload,
     this.primaryLanguageName,
     this.primaryLanguageColor,
-  })  : owner = payload.owner.displayName,
+  })  : owner = payload.ownerLogin,
         name = payload.name,
         url = '/bitbucket/${payload.fullName}',
         avatarUrl = payload.avatarUrl,