diff --git a/includes/pages/admin_active.php b/includes/pages/admin_active.php
index 6a9e96ce..c9f8679d 100644
--- a/includes/pages/admin_active.php
+++ b/includes/pages/admin_active.php
@@ -200,22 +200,26 @@ function admin_active()
. _('set active')
. '';
}
- if ($usr['Aktiv'] == 1 && $usr['Tshirt'] == 0) {
+ if ($usr['Aktiv'] == 1) {
$parametersRemove = [
'not_active' => $usr['UID'],
'search' => $search,
];
+ if ($show_all_shifts) {
+ $parametersRemove['show_all_shifts'] = 1;
+ }
+ $actions[] = ''
+ . _('remove active')
+ . '';
+ }
+ if ($usr['Tshirt'] == 0) {
$parametersShirt = [
'tshirt' => $usr['UID'],
'search' => $search,
];
if ($show_all_shifts) {
- $parametersRemove['show_all_shifts'] = 1;
$parametersShirt['show_all_shifts'] = 1;
}
- $actions[] = ''
- . _('remove active')
- . '';
$actions[] = ''
. _('got t-shirt')
. '';