diff --git a/files/templates/home.html b/files/templates/home.html
index 503c0fcb3..645eb45af 100644
--- a/files/templates/home.html
+++ b/files/templates/home.html
@@ -170,7 +170,7 @@
 	<div class="d-none" id="pusherid">{{PUSHER_ID}}</div>
 	<script src="/static/assets/js/pusher.js?a=202"></script>
 	<script>
-		if (Android){
+		if (typeof Android !== 'undefined') {
 			Android.Subscribe('{{request.host}}{{v.id}}');
 		}
 	</script>
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index 7f5018470..1011e9234 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -184,7 +184,7 @@
 							&nbsp;
 							<pre class="btn btn-secondary format d-inline-block m-0 fas fa-smile-beam" onclick="loadEmojis('input-message')" aria-hidden="true" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="Add Emoji"></pre>
 							&nbsp;
-							<input autocomplete="off" type="submit" value="Submit" class="btn btn-primary mt-3">
+							<input autocomplete="off" type="submit" value="Submit" class="btn btn-primary">
 						</form>
 
 						<div id="message-preview" class="preview-edit mt-2"></div>
@@ -473,7 +473,7 @@
 						&nbsp;
 						<pre class="btn btn-secondary format d-inline-block m-0 fas fa-smile-beam" onclick="loadEmojis('input-message-mobile')" aria-hidden="true" data-bs-toggle="modal" data-bs-target="#emojiModal" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="Add Emoji"></pre>
 						&nbsp;
-						<input autocomplete="off" type="submit" value="Submit" class="btn btn-primary mt-3">
+						<input autocomplete="off" type="submit" value="Submit" class="btn btn-primary">
 					</form>
 
 					<div id="message-preview-mobile" class="preview-edit my-3"></div>