diff --git a/lib/components/calculator/calculator.dart b/lib/components/calculator/calculator.dart
index 6f293ec..3fd3e90 100644
--- a/lib/components/calculator/calculator.dart
+++ b/lib/components/calculator/calculator.dart
@@ -66,9 +66,26 @@ class _StationAutocompleteState extends State<StationAutocomplete> {
       fieldViewBuilder:
           (context, textEditingController, focusNode, onFieldSubmitted) {
             textEditingController.value = _controller.value;
+
             return TextField(
               controller: textEditingController,
               focusNode: focusNode,
+              textInputAction: TextInputAction.done,
+              onSubmitted: (_) {
+                final query = textEditingController.text.toLowerCase();
+                final matches = widget.allStations
+                    .map((s) => s.name)
+                    .where((name) => name.toLowerCase().contains(query))
+                    .toList();
+
+                if (matches.isNotEmpty) {
+                  matches.sort((a, b) => a.length.compareTo(b.length));
+                  final firstMatch = matches.first;
+                  _controller.text = firstMatch;
+                  widget.onChanged(firstMatch);
+                  focusNode.unfocus(); // optionally close keyboard
+                }
+              },
               decoration: const InputDecoration(
                 labelText: 'Select station',
                 border: OutlineInputBorder(),
diff --git a/lib/components/login/login.dart b/lib/components/login/login.dart
index b505d23..194803e 100644
--- a/lib/components/login/login.dart
+++ b/lib/components/login/login.dart
@@ -125,7 +125,7 @@ class _LoginPanelContentState extends State<LoginPanelContent> {
       _loggingIn = true;
     });
     try {
-      auth.login(username, password);
+      await auth.login(username, password);
       print('Login successful');
       setState(() {
         _loggingIn = false;
@@ -148,7 +148,14 @@ class _LoginPanelContentState extends State<LoginPanelContent> {
     if (_loggingIn) {
       loginButtonContent = Padding(
         padding: const EdgeInsets.all(8.0),
-        child: CircularProgressIndicator(),
+        child: SizedBox(
+          height: 10,
+          width: 10,
+          child: CircularProgressIndicator(
+            color: Theme.of(context).textTheme.bodyLarge?.color,
+            strokeWidth: 2,
+          ),
+        ),
       );
     } else {
       loginButtonContent = Text("Login");