diff --git a/src/megabasterd/MainPanel.java b/src/megabasterd/MainPanel.java
index 05e1625a9..82cc9e56a 100644
--- a/src/megabasterd/MainPanel.java
+++ b/src/megabasterd/MainPanel.java
@@ -61,7 +61,7 @@ import org.apache.http.auth.UsernamePasswordCredentials;
  */
 public final class MainPanel {
 
-    public static final String VERSION = "1.81";
+    public static final String VERSION = "1.82";
     public static final int THROTTLE_SLICE_SIZE = 16 * 1024;
     public static final int STREAMER_PORT = 1337;
     public static final int WATCHDOG_PORT = 1338;
diff --git a/src/megabasterd/MainPanelView.form b/src/megabasterd/MainPanelView.form
index fecf962e3..d20256833 100644
--- a/src/megabasterd/MainPanelView.form
+++ b/src/megabasterd/MainPanelView.form
@@ -190,7 +190,7 @@
                   <Component id="logo_label" min="-2" max="-2" attributes="0"/>
                   <Component id="kiss_server_status" min="-2" pref="18" max="-2" attributes="0"/>
               </Group>
-              <EmptySpace min="-2" max="-2" attributes="0"/>
+              <EmptySpace min="-2" pref="2" max="-2" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
diff --git a/src/megabasterd/MainPanelView.java b/src/megabasterd/MainPanelView.java
index ce7e76e45..b767c58b6 100644
--- a/src/megabasterd/MainPanelView.java
+++ b/src/megabasterd/MainPanelView.java
@@ -462,7 +462,7 @@ public final class MainPanelView extends javax.swing.JFrame {
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
                     .addComponent(logo_label)
                     .addComponent(kiss_server_status, javax.swing.GroupLayout.PREFERRED_SIZE, 18, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addContainerGap())
+                .addGap(2, 2, 2))
         );
 
         pack();
diff --git a/src/megabasterd/MegaCrypterAPI.java b/src/megabasterd/MegaCrypterAPI.java
index 7cecda34c..7b1409a8c 100644
--- a/src/megabasterd/MegaCrypterAPI.java
+++ b/src/megabasterd/MegaCrypterAPI.java
@@ -211,19 +211,14 @@ public final class MegaCrypterAPI {
             noexpire_token = aux[1];
         }
 
-        String pass = null;
+        String pass;
 
         Object pass_val = res_map.get("pass");
-
-        if (pass_val instanceof Boolean) {
-
-            pass = null;
-
-        } else if (expire_val instanceof String) {
-
-            pass = (String) pass_val;
-        }
-
+        
+        pass = (String) pass_val;
+            
+        System.out.println("PASS: "+pass);
+        
         System.out.println(noexpire_token);
 
         if (pass != null) {
@@ -277,8 +272,8 @@ public final class MegaCrypterAPI {
                             }
 
                         } catch (Exception ex) {
-
-                            throw new MegaCrypterAPIException("25");
+                            
+                            bad_pass = true;
                         }
                     }