diff --git a/src/Controller/OrganisationController.php b/src/Controller/OrganisationController.php
index 8722a8a..c489a24 100644
--- a/src/Controller/OrganisationController.php
+++ b/src/Controller/OrganisationController.php
@@ -625,10 +625,12 @@ class OrganisationController extends SimpleController
         $params['ci'] = $this->ci;
 
         $sprunje = $classMapper->createInstance('organisation_sprunje', $classMapper, $params);
+        $sprunje->extendQuery(function ($query) use ($currentUser) {
+            return $query->withUser($currentUser->id);
+            });
         if (!$currentUser->isMaster() && $currentUser->roles()->where('slug', 'organisations-admin')->count() == 0) {
-            $sprunje->extendQuery(function ($query) use ($currentUser) {
+            $sprunje->extendQuery(function ($query) {
                 return $query->where('flag_approved', true)
-                    ->withUser($currentUser->id)
                     ->orWhereNotNull('is_member');
             });
         }
diff --git a/templates/tables/organisations.html.twig b/templates/tables/organisations.html.twig
index 4f77757..c3d88d0 100644
--- a/templates/tables/organisations.html.twig
+++ b/templates/tables/organisations.html.twig
@@ -92,7 +92,7 @@
     <script id="organisation-table-column-join" type="text/x-handlebars-template">
         <td>
             <div class="btn-group">
-                {{#ifx row.is_pending '==' 0 }}
+                {{#ifx row.is_pending '==' 1 }}
                     <button type="button" data-slug="{{row.slug}}" class="btn btn-danger js-organisation-cancelJoin" style="min-width: 70px">
                         {% endverbatim %}{{translate("CANCEL")}}{% verbatim %}
                     </button>