2 files changed, 13 insertions, 1 deletions
diff --git a/resources/qml/pages/LoginPage.qml b/resources/qml/pages/LoginPage.qml
index 87234a22..46036242 100644
--- a/resources/qml/pages/LoginPage.qml
+++ b/resources/qml/pages/LoginPage.qml
@@ -76,10 +76,12 @@ Item {
             }
 
             MatrixText {
+                Layout.fillWidth: true
                 textFormat: Text.PlainText
                 color: Nheko.theme.error
                 text: login.mxidError
                 visible: text
+                wrapMode: TextEdit.Wrap
             }
 
             MatrixTextField {
@@ -130,10 +132,12 @@ Item {
             }
 
             MatrixText {
+                Layout.fillWidth: true
                 textFormat: Text.PlainText
                 color: Nheko.theme.error
                 text: loginPage.error
                 visible: text
+                wrapMode: TextEdit.Wrap
             }
 
             FlatButton {
diff --git a/resources/qml/pages/RegisterPage.qml b/resources/qml/pages/RegisterPage.qml
index 44836ccb..2b2f56bd 100644
--- a/resources/qml/pages/RegisterPage.qml
+++ b/resources/qml/pages/RegisterPage.qml
@@ -75,10 +75,12 @@ Item {
             }
 
             MatrixText {
+                Layout.fillWidth: true
                 textFormat: Text.PlainText
                 color: Nheko.theme.error
                 text: regis.hsError
                 visible: text
+                wrapMode: TextEdit.Wrap
             }
 
             RowLayout {
@@ -122,10 +124,12 @@ Item {
             }
 
             MatrixText {
+                Layout.fillWidth: true
                 textFormat: Text.PlainText
                 color: Nheko.theme.error
                 text: regis.usernameError
-                visible: text
+                visible: text && regis.supported
+                wrapMode: TextEdit.Wrap
             }
 
 
@@ -147,10 +151,12 @@ Item {
             }
 
             MatrixText {
+                Layout.fillWidth: true
                 visible: regis.supported
                 textFormat: Text.PlainText
                 color: Nheko.theme.error
                 text: passwordLabel.text != passwordConfirmationLabel.text ? qsTr("Your passwords do not match!") : ""
+                wrapMode: TextEdit.Wrap
             }
 
             MatrixTextField {
@@ -177,10 +183,12 @@ Item {
             }
 
             MatrixText {
+                Layout.fillWidth: true
                 textFormat: Text.PlainText
                 color: Nheko.theme.error
                 text: registrationPage.error
                 visible: text
+                wrapMode: TextEdit.Wrap
             }
 
             FlatButton {