diff --git a/src/components/labeled-input.tsx b/src/components/labeled-input.tsx
index 7b4768a..7a416d4 100644
--- a/src/components/labeled-input.tsx
+++ b/src/components/labeled-input.tsx
@@ -6,23 +6,24 @@ export default function LabeledInput({
   label,
   placeholder,
   value,
+  name,
 }: {
   type: 'text' | 'email' | 'password';
   label: string;
   placeholder?: string;
   value?: string;
+  name?: string;
 }) {
-  const elementId = Math.random().toString(36).substring(2, 15);
-
   return (
     <div className='flex flex-col gap-1'>
-      <Label htmlFor={elementId}>{label}</Label>
+      <Label htmlFor={name}>{label}</Label>
 
       <Input
         type={type}
         placeholder={placeholder}
         defaultValue={value}
-        id={elementId}
+        id={name}
+        name={name}
       />
     </div>
   );
diff --git a/src/components/user/login-form.tsx b/src/components/user/login-form.tsx
index 20438e8..f2be41a 100644
--- a/src/components/user/login-form.tsx
+++ b/src/components/user/login-form.tsx
@@ -6,13 +6,15 @@ export default function LoginForm() {
     <form className='flex flex-col gap-5 w-full'>
       <LabeledInput
         type='email'
-        label='E-Mail'
-        placeholder='Enter your E-Mail'
+        label='E-Mail or Username'
+        placeholder='What you are known as.'
+        name='email'
       />
       <LabeledInput
         type='password'
         label='Password'
-        placeholder='Enter your Password'
+        placeholder="Let's hope you remember it."
+        name='password'
       />
       <Button
         className='hover:bg-blue-600 hover:text-white'