diff --git a/lam/lib/modules/asteriskAccount.inc b/lam/lib/modules/asteriskAccount.inc
index 09a9e052..05c5d557 100644
--- a/lam/lib/modules/asteriskAccount.inc
+++ b/lam/lib/modules/asteriskAccount.inc
@@ -245,9 +245,8 @@ class asteriskAccount extends baseModule implements passwordService {
 			),
 		);
 		// self service options
-		$selfServiceContainer = new htmlTable();
-		$selfServiceContainer->addElement(new htmlTableExtendedInputField(_('Asterisk realm'), 'asteriskAccount_AsteriskRealm', null));
-		$selfServiceContainer->addElement(new htmlHelpLink('AsteriskRealm', get_class($this)));
+		$selfServiceContainer = new htmlResponsiveRow();
+		$selfServiceContainer->add(new htmlResponsiveInputField(_('Asterisk realm'), 'asteriskAccount_AsteriskRealm', null, array('AsteriskRealm', get_class($this))), 12);
 		$return['selfServiceSettings'] = $selfServiceContainer;
 		// profile options
 		$profileContainer = new htmlTable();
diff --git a/lam/lib/modules/posixAccount.inc b/lam/lib/modules/posixAccount.inc
index d078d957..ae117d27 100644
--- a/lam/lib/modules/posixAccount.inc
+++ b/lam/lib/modules/posixAccount.inc
@@ -178,16 +178,11 @@ class posixAccount extends baseModule implements passwordService {
 			// possible self service read-only fields
 			$return['selfServiceReadOnlyFields'] = array('cn', 'loginShell');
 			// self service configuration settings
-			$selfServiceContainer = new htmlTable();
-			$selfServiceContainer->addElement(new htmlTableExtendedSelect('posixAccount_pwdHash', getSupportedHashTypes(),
-				array('SSHA'), _("Password hash type")));
-			$selfServiceContainer->addElement(new htmlHelpLink('pwdHash', get_class($this)), true);
-			$selfServiceContainer->addElement(new htmlTableExtendedInputTextarea('posixAccount_shells', implode("\r\n", $this->getShells()), 30, 4, _('Login shells')));
-			$loginShellsHelp = new htmlHelpLink('loginShells', get_class($this));
-			$loginShellsHelp->alignment = htmlElement::ALIGN_TOP;
-			$selfServiceContainer->addElement($loginShellsHelp, true);
-			$selfServiceContainer->addElement(new htmlTableExtendedInputCheckbox('posixAccount_useOldPwd', false, _('Password change with old password')));
-			$selfServiceContainer->addElement(new htmlHelpLink('useOldPwd', get_class($this)), true);
+			$selfServiceContainer = new htmlResponsiveRow();
+			$selfServiceContainer->add(new htmlResponsiveSelect('posixAccount_pwdHash', getSupportedHashTypes(),
+				array('SSHA'), _("Password hash type"), array('pwdHash', get_class($this))), 12);
+			$selfServiceContainer->add(new htmlResponsiveInputTextarea('posixAccount_shells', implode("\r\n", $this->getShells()), 30, 4, _('Login shells'), array('loginShells', get_class($this))), 12);
+			$selfServiceContainer->add(new htmlResponsiveInputCheckbox('posixAccount_useOldPwd', false, _('Password change with old password'), array('useOldPwd', get_class($this))), 12);
 			$return['selfServiceSettings'] = $selfServiceContainer;
 		}
 		// profile checks
diff --git a/lam/lib/modules/pykotaUser.inc b/lam/lib/modules/pykotaUser.inc
index 03d0879a..b97863e9 100644
--- a/lam/lib/modules/pykotaUser.inc
+++ b/lam/lib/modules/pykotaUser.inc
@@ -254,9 +254,8 @@ class pykotaUser extends baseModule {
 		);
 		// self service settings
 		if (get_class($this) == 'pykotaUser') {
-			$selfServiceContainer = new htmlTable();
-			$selfServiceContainer->addElement(new htmlTableExtendedInputField(_('Job suffix'), 'pykotaUser_jobSuffix', null));
-			$selfServiceContainer->addElement(new htmlHelpLink('jobSuffix', get_class($this)), true);
+			$selfServiceContainer = new htmlResponsiveRow();
+			$selfServiceContainer->add(new htmlResponsiveInputField(_('Job suffix'), 'pykotaUser_jobSuffix', null, array('jobSuffix', get_class($this))), 12);
 			$return['selfServiceSettings'] = $selfServiceContainer;
 		}
 		// configuration checks