diff --git a/CLAUDE.md b/CLAUDE.md
index a2ad7e2..8b44818 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -98,7 +98,7 @@ src/
 │   ├── EventConfirmDialog.tsx  # AI-proposed event confirmation modal (skeleton)
 │   ├── ProposedEventCard.tsx   # Chat event proposal (uses EventCardBase + confirm/reject/edit buttons)
 │   ├── DeleteEventModal.tsx    # Delete confirmation modal (uses ModalBase)
-│   ├── CustomTextInput.tsx     # Themed text input with focus border (used in CaldavSettings)
+│   ├── CustomTextInput.tsx     # Themed text input with focus border (used in login, register, CaldavSettings, editEvent)
 │   ├── DateTimePicker.tsx      # Date and time picker components
 │   └── ScrollableDropdown.tsx  # Scrollable dropdown component
 ├── Themes.tsx                  # Theme definitions: THEMES object with defaultLight/defaultDark, Theme type
@@ -602,8 +602,8 @@ NODE_ENV=development        # development = pretty logs, production = JSON
   - `AuthService`: login(), register(), logout() - calls backend API
   - `ApiClient`: Automatically injects X-User-Id header for authenticated requests, handles empty responses (204)
   - `AuthGuard`: Reusable component that wraps protected routes - loads user, preloads app data (events + CalDAV config) into stores before dismissing spinner, triggers CalDAV sync, shows loading, redirects if unauthenticated. Exports `preloadAppData()` (also called by `login.tsx`)
-  - Login screen: Supports email OR userName login, preloads app data + triggers CalDAV sync after successful login
-  - Register screen: Email validation, checks for existing email/userName
+  - Login screen: Supports email OR userName login, uses CustomTextInput with focus border, preloads app data + triggers CalDAV sync after successful login
+  - Register screen: Email validation, checks for existing email/userName, uses CustomTextInput with focus border
   - `AuthButton`: Reusable button component with themed shadow
   - `Header`: Themed header component (logout moved to Settings)
   - `(tabs)/_layout.tsx`: Wraps tabs with AuthGuard for protected access
@@ -639,7 +639,7 @@ NODE_ENV=development        # development = pretty logs, production = JSON
 - `EventService`: getAll(), getById(), getByDateRange(), create(), update(), delete(mode, occurrenceDate) - fully implemented with recurring delete modes
 - `ChatService`: sendMessage(), confirmEvent(deleteMode, occurrenceDate), rejectEvent(), getConversations(), getConversation(), updateProposalEvent() - fully implemented with cursor pagination, recurring delete support, and proposal editing
 - `CaldavConfigService`: saveConfig(), getConfig(), deleteConfig(), pull(), pushAll(), sync() - CalDAV config management and sync trigger
-- `CustomTextInput`: Themed text input component with focus border highlight, supports controlled value via `text` prop
+- `CustomTextInput`: Themed text input with focus border highlight. Props: `text`, `onValueChange`, `placeholder`, `placeholderTextColor`, `secureTextEntry`, `autoCapitalize`, `keyboardType`, `className`, `multiline`. No default padding — callers must set padding via `className` (e.g., `px-3 py-2` or `p-4`)
 - `CardBase`: Reusable card component with header (title/subtitle), content area, and optional footer button - configurable padding, border, text size via props, ScrollView uses `nestedScrollEnabled` for Android
 - `ModalBase`: Reusable modal wrapper with backdrop (absolute-positioned behind card), uses CardBase internally - provides click-outside-to-close, Android back button support, and proper scrolling on Android
 - `EventCardBase`: Event card with date/time/recurring icons - uses CardBase for structure. Accepts `recurrenceRule` string (not boolean) and displays German-formatted recurrence via `formatRecurrenceRule()`
diff --git a/apps/client/src/app/(tabs)/settings.tsx b/apps/client/src/app/(tabs)/settings.tsx
index b9c0fdf..04f2f0e 100644
--- a/apps/client/src/app/(tabs)/settings.tsx
+++ b/apps/client/src/app/(tabs)/settings.tsx
@@ -44,7 +44,7 @@ const CaldavTextInput = ({
     <View className="flex flex-row items-center py-1">
       <Text className="ml-4 w-24">{title}:</Text>
       <CustomTextInput
-        className="flex-1 mr-4"
+        className="flex-1 mr-4 px-3 py-2"
         text={value}
         onValueChange={onValueChange}
       />
diff --git a/apps/client/src/app/editEvent.tsx b/apps/client/src/app/editEvent.tsx
index d1968d4..23980a5 100644
--- a/apps/client/src/app/editEvent.tsx
+++ b/apps/client/src/app/editEvent.tsx
@@ -43,7 +43,7 @@ const EditEventTextField = (props: EditEventTextFieldProps) => {
         {props.titel}
       </Text>
       <CustomTextInput
-        className="flex-1"
+        className="flex-1 px-3 py-2"
         text={props.text}
         multiline={props.multiline}
         onValueChange={props.onValueChange}
diff --git a/apps/client/src/app/login.tsx b/apps/client/src/app/login.tsx
index c33911d..a20522f 100644
--- a/apps/client/src/app/login.tsx
+++ b/apps/client/src/app/login.tsx
@@ -1,8 +1,9 @@
 import { useState } from "react";
-import { View, Text, TextInput, Pressable } from "react-native";
+import { View, Text, Pressable } from "react-native";
 import { Link, router } from "expo-router";
 import BaseBackground from "../components/BaseBackground";
 import AuthButton from "../components/AuthButton";
+import CustomTextInput from "../components/CustomTextInput";
 import { AuthService } from "../services";
 import { CaldavConfigService } from "../services/CaldavConfigService";
 import { preloadAppData } from "../components/AuthGuard";
@@ -59,34 +60,22 @@ const LoginScreen = () => {
           </Text>
         )}
 
-        <TextInput
+        <CustomTextInput
           placeholder="E-Mail oder Benutzername"
           placeholderTextColor={theme.textMuted}
-          value={identifier}
-          onChangeText={setIdentifier}
+          text={identifier}
+          onValueChange={setIdentifier}
           autoCapitalize="none"
           className="w-full rounded-lg p-4 mb-4"
-          style={{
-            backgroundColor: theme.secondaryBg,
-            color: theme.textPrimary,
-            borderWidth: 1,
-            borderColor: theme.borderPrimary,
-          }}
         />
 
-        <TextInput
+        <CustomTextInput
           placeholder="Passwort"
           placeholderTextColor={theme.textMuted}
-          value={password}
-          onChangeText={setPassword}
+          text={password}
+          onValueChange={setPassword}
           secureTextEntry
           className="w-full rounded-lg p-4 mb-6"
-          style={{
-            backgroundColor: theme.secondaryBg,
-            color: theme.textPrimary,
-            borderWidth: 1,
-            borderColor: theme.borderPrimary,
-          }}
         />
 
         <AuthButton
diff --git a/apps/client/src/app/register.tsx b/apps/client/src/app/register.tsx
index e2a9ba8..f7614ab 100644
--- a/apps/client/src/app/register.tsx
+++ b/apps/client/src/app/register.tsx
@@ -1,8 +1,9 @@
 import { useState } from "react";
-import { View, Text, TextInput, Pressable } from "react-native";
+import { View, Text, Pressable } from "react-native";
 import { Link, router } from "expo-router";
 import BaseBackground from "../components/BaseBackground";
 import AuthButton from "../components/AuthButton";
+import CustomTextInput from "../components/CustomTextInput";
 import { AuthService } from "../services";
 import { useThemeStore } from "../stores/ThemeStore";
 
@@ -59,50 +60,32 @@ const RegisterScreen = () => {
           </Text>
         )}
 
-        <TextInput
+        <CustomTextInput
           placeholder="E-Mail"
           placeholderTextColor={theme.textMuted}
-          value={email}
-          onChangeText={setEmail}
+          text={email}
+          onValueChange={setEmail}
           autoCapitalize="none"
           keyboardType="email-address"
           className="w-full rounded-lg p-4 mb-4"
-          style={{
-            backgroundColor: theme.secondaryBg,
-            color: theme.textPrimary,
-            borderWidth: 1,
-            borderColor: theme.borderPrimary,
-          }}
         />
 
-        <TextInput
+        <CustomTextInput
           placeholder="Benutzername"
           placeholderTextColor={theme.textMuted}
-          value={userName}
-          onChangeText={setUserName}
+          text={userName}
+          onValueChange={setUserName}
           autoCapitalize="none"
           className="w-full rounded-lg p-4 mb-4"
-          style={{
-            backgroundColor: theme.secondaryBg,
-            color: theme.textPrimary,
-            borderWidth: 1,
-            borderColor: theme.borderPrimary,
-          }}
         />
 
-        <TextInput
+        <CustomTextInput
           placeholder="Passwort"
           placeholderTextColor={theme.textMuted}
-          value={password}
-          onChangeText={setPassword}
+          text={password}
+          onValueChange={setPassword}
           secureTextEntry
           className="w-full rounded-lg p-4 mb-6"
-          style={{
-            backgroundColor: theme.secondaryBg,
-            color: theme.textPrimary,
-            borderWidth: 1,
-            borderColor: theme.borderPrimary,
-          }}
         />
 
         <AuthButton
diff --git a/apps/client/src/components/CustomTextInput.tsx b/apps/client/src/components/CustomTextInput.tsx
index ec273f0..8fb5c91 100644
--- a/apps/client/src/components/CustomTextInput.tsx
+++ b/apps/client/src/components/CustomTextInput.tsx
@@ -1,4 +1,4 @@
-import { TextInput } from "react-native";
+import { TextInput, TextInputProps } from "react-native";
 import { useThemeStore } from "../stores/ThemeStore";
 import { useState } from "react";
 
@@ -8,6 +8,11 @@ export type CustomTextInputProps = {
   className?: string;
   multiline?: boolean;
   onValueChange?: (text: string) => void;
+  placeholder?: string;
+  placeholderTextColor?: string;
+  secureTextEntry?: boolean;
+  autoCapitalize?: TextInputProps["autoCapitalize"];
+  keyboardType?: TextInputProps["keyboardType"];
 };
 
 const CustomTextInput = (props: CustomTextInputProps) => {
@@ -16,10 +21,15 @@ const CustomTextInput = (props: CustomTextInputProps) => {
 
   return (
     <TextInput
-      className={`border border-solid rounded-2xl px-3 py-2 h-11/12 ${props.className}`}
+      className={`border border-solid rounded-2xl ${props.className}`}
       onChangeText={props.onValueChange}
       value={props.text}
       multiline={props.multiline}
+      placeholder={props.placeholder}
+      placeholderTextColor={props.placeholderTextColor}
+      secureTextEntry={props.secureTextEntry}
+      autoCapitalize={props.autoCapitalize}
+      keyboardType={props.keyboardType}
       style={{
         backgroundColor: theme.messageBorderBg,
         color: theme.textPrimary,