diff --git a/CHANGELOG.md b/CHANGELOG.md
index f939bc5ea48c5267f86d26457ad7d5375b1ba38c..96cb6316295d2d092143336b7caf6f20d23be963 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Correctly sort claimed time slots in admin view [@cedricwilleken](https://gitlab.ewi.tudelft.nl/cedricwilleken)
 - Stop language button from overflowing on tablet screen size and landscape phone size [@cedricwilleken](https://gitlab.ewi.tudelft.nl/cedricwilleken)
+- Fix token login form overflow on mobile devices [@gandreadis](https://gitlab.ewi.tudelft.nl/gandreadis)
 
 ## [1.2.0] - (2020-05-20)
 ### Added
diff --git a/src/main/resources/templates/login/login-guest-form.html b/src/main/resources/templates/login/login-guest-form.html
index 2c8a23461a081dd7763a5d8871ab1e1527b0dbbe..97303b7843f773c899fab5c416c13eac99480d94 100644
--- a/src/main/resources/templates/login/login-guest-form.html
+++ b/src/main/resources/templates/login/login-guest-form.html
@@ -6,12 +6,12 @@
 		<input type="hidden" id="guest-username" name="username"/>
 		<input type="hidden" id="guest-password" name="password"/>
 		<div class="form-row">
-			<div class="col-md-4 col-8">
+			<div class="col-lg-4 col-md-6 col-sm-8 col-12 mb-md-0 mb-1">
 				<input th:placeholder="#{generic.token}" placeholder="Token" id="guest-token"
 					   class="form-control guest-login-code" type="text" name="token"
 					   autofocus required autocapitalize="none"/>
 			</div>
-			<div class="col-0">
+			<div class="col-lg-4 col-md-6 col-sm-4 col-12">
 				<button class="btn btn-primary btn-lg btn-visit" type="submit">
 					<span th:text="#{home.visit}">visit</span>
 					<img src="/img/icons/right-arrow.svg" height="25" class="ml-1" alt="Arrow">