diff --git a/dashboard/src/components/GroupDialog.vue b/dashboard/src/components/GroupDialog.vue
index cb08d6d2d..864db22e1 100644
--- a/dashboard/src/components/GroupDialog.vue
+++ b/dashboard/src/components/GroupDialog.vue
@@ -50,8 +50,6 @@ async function onSubmit() {
 
 defineExpose({
   async open(g = null) {
-    console.log(g)
-
     group.value = g;
     name.value = g ? g.name : '';
 
diff --git a/dashboard/src/components/ImpersonateDialog.vue b/dashboard/src/components/ImpersonateDialog.vue
index 74edc34ff..be35d62d7 100644
--- a/dashboard/src/components/ImpersonateDialog.vue
+++ b/dashboard/src/components/ImpersonateDialog.vue
@@ -1,7 +1,7 @@
 <script setup>
 
 import { ref, useTemplateRef } from 'vue';
-import { Dialog, TextInput, FormGroup, Button } from 'pankow';
+import { Dialog, TextInput, FormGroup, Button, InputGroup } from 'pankow';
 import { copyToClipboard } from 'pankow/utils';
 import UsersModel from '../models/UsersModel.js';
 
@@ -74,9 +74,11 @@ defineExpose({
       <fieldset :disabled="busy">
         <FormGroup>
           <label for="passwordInput">{{ $t('users.setGhostDialog.password') }}</label>
-          <TextInput id="passwordInput" v-model="password" />
-          <Button tool v-if="success" @click="onCopyPassword()" icon="fa fa-clipboard" />
-          <Button tool v-else @click="onGeneratePassword()" v-tooltip="$t('users.setGhostDialog.generatePassword')" icon="fa fa-key" />
+          <InputGroup>
+            <TextInput id="passwordInput" v-model="password" style="flex-grow: 1;"/>
+            <Button tool v-if="success" @click="onCopyPassword()" icon="fa fa-clipboard" />
+            <Button tool v-else @click="onGeneratePassword()" v-tooltip="$t('users.setGhostDialog.generatePassword')" icon="fa fa-key" />
+          </InputGroup>
         </FormGroup>
       </fieldset>
     </form>
diff --git a/dashboard/src/components/PasswordResetDialog.vue b/dashboard/src/components/PasswordResetDialog.vue
index b79359997..ffad4f438 100644
--- a/dashboard/src/components/PasswordResetDialog.vue
+++ b/dashboard/src/components/PasswordResetDialog.vue
@@ -5,7 +5,7 @@ const i18n = useI18n();
 const t = i18n.t;
 
 import { ref, useTemplateRef } from 'vue';
-import { Dialog, TextInput, FormGroup, Button } from 'pankow';
+import { Dialog, TextInput, FormGroup, Button, InputGroup } from 'pankow';
 import { copyToClipboard } from 'pankow/utils';
 import UsersModel from '../models/UsersModel.js';
 
@@ -62,8 +62,10 @@ defineExpose({
   >
     <FormGroup>
       <label class="control-label">{{ $t('users.passwordResetDialog.descriptionLink') }}</label>
-      <TextInput id="passwordResetLinkInput" v-model="resetLink" readonly/>
-      <Button tool @click="onCopyLink()" icon="fa fa-clipboard" />
+      <InputGroup>
+        <TextInput id="passwordResetLinkInput" style="flex-grow: 1;" v-model="resetLink" readonly/>
+        <Button tool @click="onCopyLink()" icon="fa fa-clipboard" />
+      </InputGroup>
     </FormGroup>
 
     <br/>
@@ -75,8 +77,10 @@ defineExpose({
 
         <FormGroup>
           <label for="emailInput">{{ $t('users.passwordResetDialog.descriptionEmail') }}</label>
-          <TextInput id="emailInput" v-model="email" :disabled="busy" />
-          <Button @click="onSend()" :disabled="busy" :loading="busy">{{ $t('users.passwordResetDialog.sendAction') }}</Button>
+          <InputGroup>
+            <TextInput id="emailInput" style="flex-grow: 1;" v-model="email" :disabled="busy" />
+            <Button @click="onSend()" :disabled="busy" :loading="busy">{{ $t('users.passwordResetDialog.sendAction') }}</Button>
+          </InputGroup>
         </FormGroup>
       </fieldset>
     </form>