1 files changed, 2 insertions, 1 deletions
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterNumberComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterNumberComposite.java
index eb2a4bfe..e576bb6a 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterNumberComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/MobileBKUEnterNumberComposite.java
@@ -317,8 +317,9 @@ public class MobileBKUEnterNumberComposite extends StateComposite {
 	public void setMobileNumber(String mobileNumber) {
 		this.mobileNumber = mobileNumber;
 
-		if (this.mobileNumber != null) {
+		if (this.mobileNumber != null && !this.mobileNumber.isEmpty()) {
 			this.txt_number.setText(this.mobileNumber);
+			this.txt_password.setFocus();
 		} else {
 			this.txt_number.setText(""); //$NON-NLS-1$
 		}